First commit
Merge branch 'master' of https://github.com/nsaxton/CSE335Project1