What the hell does it think I need to commit?
Merge branch 'master' of https://github.com/koprajr/CS452-PROJECT1