Almost got the player to be rendered, but not yet, not sure why.
Merge remote-tracking branch 'origin/master'

Conflicts:
	LudumDare30/src/introstate.cpp