Fixed git shit
Merge branch 'master' of https://github.com/M-Clausen/SNAKE2.0

Conflicts:
	include/map.h
	include/snake.h
	src/game/game.cpp
	src/game/map.cpp
	src/game/snake.cpp