resolve conflicts
resolve conflicts
Merge branch 'newbr'

Conflicts:
	src/game.coffee
turns and basic enemy movements
Merge branch 'master' of github.com:LanJian/tempest

Conflicts:
	src/battleField.coffee