test
remove sky
test
fix confliction
change fps to 20
change fps to 30
Merge branch 'master' into chihiro_testing

Conflicts:
	source/global.h
Merge branch 'master' of https://github.com/TheTwentySecondGroup/game.git
Merge remote-tracking branch 'origin/master' into chihiro_testing

Conflicts:
	testprogram