Edited the weapon class to have a position
Merge branch 'master' of https://github.com/Royalmack/SEP-Assignment

Conflicts:
	Artnoc/Debug/SEP.exe
	Artnoc/Debug/SEP.ilk
	Artnoc/Debug/SEP.pdb
	Artnoc/SEP.sdf
	Artnoc/SEP.v11.suo
	Artnoc/SEP/Debug/Actor.obj
	Artnoc/SEP/Debug/Bullet.obj
	Artnoc/SEP/Debug/CL.read.1.tlog
	Artnoc/SEP/Debug/Enemy.obj
	Artnoc/SEP/Debug/Game.obj
	Artnoc/SEP/Debug/Image.obj
	Artnoc/SEP/Debug/MachineGun.obj
	Artnoc/SEP/Debug/Pistol.obj
	Artnoc/SEP/Debug/Player.obj
	Artnoc/SEP/Debug/TestHarness.obj
	Artnoc/SEP/Debug/TestMain.obj
	Artnoc/SEP/Debug/Vector.obj
	Artnoc/SEP/Debug/Weapon.obj
	Artnoc/SEP/Debug/vc110.idb
	Artnoc/SEP/Debug/vc110.pdb
	Artnoc/SEP/Enemy.h
	Artnoc/SEP/Game.cpp
	Artnoc/SEP/Image.h