Fixing segfault
Merge branch 'master' of github.com:mdevlamynck/yasw

Conflicts:
	src/Game.cpp