final commit
Merge branch 'master' of github.com:ajolicoe/cmps112-project