Class Map Cell Item ItemFixe Wall
Merge remote-tracking branch 'origin/master'

Conflicts:
	CMakeLists.txt
	src/GameObjects/Player.cpp
	src/main.cpp