changed WASD and weapon mode, and added gun
Merge branch 'master' of github.com:Pjchardt/PinkElephant

Conflicts:
	Assets/Player.cs