Movement and combat

Moving into another sentient's tile now causes a melee attack.

Conflicts:
	Roguelike/src/game/Controller.java