First
Initial merge.

Merge branch 'master' of https://github.com/j-rewerts/CMPUT379_Assignment1