turret positioning
Merge branch 'master' of https://github.com/rek/gunday

Conflicts:
	www/js/play.js