fixed some GameTime stuff
Merge branch 'master' of https://github.com/GearChicken/MINX

Conflicts:
	src/GameTime.cpp
	src/GameTime.h
got rid of universal shader loading