Build directory is now substituted for src directory when building intermediate object files, instead of being prepended
Merge branch 'master' of github.com:Kromey/roglik

Conflicts:
	Makefile