load Makefile in main, don't do anything with it yet
Merge branch 'master' of https://www.github.com/130610/sd-project
added box drawing, no hitboxes yet, and line drawing doesn't work, though it is getting there also split some drawing functions into a different file
Merge branch 'master' of https://www.github.com/130610/sd-project
saving some changes to start
Merge branch 'master' of github.com:130610/sd-project

Conflicts:
	source/start.cpp