cleaning
Merge branch 'master' of github.com:twist/of

Conflicts:
	src/game.cpp