Added makefile
Fixed a couple little bugs
Merge branch 'master' of github.com:davsuss/CS3824