Added makefile stuff
Merge branch 'master' of github.com:nightfire2/cptr355-final-project

Conflicts:
	bin/Debug/cptr355-final-project