Shotgun change.
Merge branch 'master' of https://github.com/sugordon/Tonka.git
More Weapons
Fixed everything.

Merge branch 'master' of https://github.com/sugordon/Tonka.git

Conflicts:
	src/game/Game.java