Lot of things
Merge branch 'master' of github.com:MaxWayt/RType

Conflicts:
	src/client/Player.hh
Better monster