Improved Makefile.
Merge branch 'master' of ssh://github.com/Exeter-College-Game-Development/ECGame

Conflicts:
	Makefile