Building commit e64a9a6006fe4b2e2bb014a96713ed421f0d6056.
Building commit 02658b62868a1200b7c819bc4b72d498fba3c491.
Building commit 52c6e900d574a46f38dbb81473c2deb34654bf7c.
Merge branch 'master' of heroku.com:battleship-gb into experiment-reflection

Conflicts:
	BattleShip.tmproj
	package.json
	src/page.coffee