Adding stuff
stuff
Merge branch 'master' of https://github.com/keerthik/swarmcombat

Conflicts:
	app/assets/javascripts/swarmgame.js