First commit. Can build.
Merge branch 'master' of github.com:rattboi/cs447-proj2