yolo
Merge branch 'master' of https://github.com/maresc-g/rtype

Conflicts:
	rtype/Server/src/GameLoop/GameLoop.cpp
	rtype/Server/src/Level/Map.cpp
yolo