Fixing a few state things
Merge remote-tracking branch 'origin/master'

Conflicts:
	LudumDare30/src/introstate.cpp
Merge remote-tracking branch 'origin/master'
Fixed the project once more