Some rough skeleton code
Merge branch 'master' of github.com:Loche/cs118-project2