Killing things
Merge branch 'master' of git://github.com/Loche/cs118-project2