phaser test
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html
	js/Base.js
	js/Piece.js
	js/Sector.js
	js/Team.js
	js/main.js
phaser test