added formation code... again.
Merge branch 'master' of https://github.com/padoyle/GGJ2014SpaceShooter5P1C

Conflicts:
	js/main.js