little commit
Merge branch 'master' of github.com:gyzerok/game

Conflicts:
	code/src/controller.cpp