monsters move and trigger attacks properly

human attacks first if moves into monster,
monster attacks first if moves into player (happens rarely, usually only
when many monsters surrounding player, as the monster has to move once
to keep up with the player if he the player moves to a new '.' spot)
Merge remote-tracking branch 'origin/master'

Conflicts:
	town.cpp