First Commit
Merge branch 'master' of https://github.com/mdfeist/CMPUT291Project1