fix Model.cpp
fix model to be able to move
Merge remote-tracking branch 'origin/yuuki2' into na3alf6_testing

Conflicts:
	testprogram
test
Merge branch 'master' of https://github.com/TheTwentySecondGroup/game
fix map
fix light