made kamikaze behaviour
fixed merge conlficts
Merge pull request #55 from znagler/small_alien_behavior

Small alien behavior
randomize movement of alien boss
merge in master
Merge branch 'master' of https://github.com/znagler/flashforward into boss_movement

Conflicts:
	app/assets/javascripts/fight.js
	app/assets/javascripts/game_ui.js