Resolves merge conflict#2
Merged
patrykkopycinski merged 34 commits intoNov 14, 2020
Merged
Commits
Commits on Nov 12, 2020
- authored
John Schulz - authored
- authored
- andauthored
- andauthored

- authored
- authored
- authored
- andauthored

- authored
- andauthored
- authored
- authored
Constance - authored
- authored
- authored
John Schulz - authored
- authored
- authored
- authored
- authored
- andauthored
- authored
- andauthored
- authored
- andauthored

- authored
- authored
- authored
Commits on Nov 13, 2020
- authored
- andauthored

- authored
- authored