Tutoriel et text
Merge
Merge branch 'merge'

Conflicts:
	src/Game.cpp
	src/Game.hpp
Merge branch 'master' of https://github.com/mdevlamynck/yasw