WIP: working w/ git
Merged master fixed conflict
Merge branch 'make-tests-pass'
Cleaning up branch with finished tests