added gun weapon and weapon switching
added gun weapon and weapon switching
Merge branch 'master' of github.com:Lemonice/AngryCarl

Conflicts:
	AngryCarl.project.gmx
final commit for 2/16/2013
Merge branch 'master' of github.com:Lemonice/AngryCarl