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

Conflicts:
	rtype/Server/include/Entities/Mob.hh
	rtype/Server/src/Entities/Mob.cpp