Rollback to commit before merging retardation...
This one should actually work!!!

Merge branch 'master' of https://github.com/DirkLaserblast/Goldenrod_Engine

Conflicts:
	Goldenrod Engine/main.cpp