save
Merge remote-tracking branch 'origin/dcsan' into pilot
resolved
adding bullets
Merge remote-tracking branch 'origin/master' into pilot

Conflicts:
	app/both/routes.coffee
Merge remote-tracking branch 'origin/master' into pilot
Merge remote-tracking branch 'origin/dcsan' into pilot
Merge remote-tracking branch 'origin/master' into pilot

Conflicts:
	app/both/collections/Battles.coffee
Merge remote-tracking branch 'origin/master' into pilot

Conflicts:
	app/both/routes.coffee
rmoved bullets.coffe
multipler moves
Merge branch 'pilot'