Got a tank in there lookin fine
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	views/ld26.coffee
	views/tank.coffee
Merge remote-tracking branch 'origin/develop' into develop