Added rifle.png to the thingy
Saving and merging stuff
Merge branch 'master' of github.com:Bacon41/PantheonPrototype

Conflicts:
	PantheonPrototype/PantheonPrototypeContent/Rifle.png
Merge branch 'master' of github.com:Bacon41/PantheonPrototype