Merge branch 'master' into gh-pages

Conflicts:
	app/sudmalinas.js
Merge branch 'master' into gh-pages

Conflicts:
	app/sudmalinas.js
Fixed JS bug
 Please enter the commit message for your changes. Lines starting
Player is now working on Firefox
Now either of tanks and humans look great
Updates in dance
Updates in sudmalinas
Merge branch 'gh-pages'

Conflicts:
	app/index.html