Updating with current repo.
Merge branch 'master' of https://github.com/gwalker91/GJSpringTeam4

Conflicts:
	SpringGameJam/Debug/SpringGameJam.pdb
	SpringGameJam/SpringGameJam.sdf
	SpringGameJam/SpringGameJam.suo
	SpringGameJam/SpringGameJam/Debug/CL.read.1.tlog
	SpringGameJam/SpringGameJam/Debug/CL.write.1.tlog
	SpringGameJam/SpringGameJam/Debug/SpringGameJam.log
	SpringGameJam/SpringGameJam/Debug/cl.command.1.tlog
	SpringGameJam/SpringGameJam/Debug/link.command.1.tlog
	SpringGameJam/SpringGameJam/Debug/link.read.1.tlog
	SpringGameJam/SpringGameJam/Debug/link.write.1.tlog
	SpringGameJam/SpringGameJam/Debug/vc100.idb
	SpringGameJam/SpringGameJam/Debug/vc100.pdb
	SpringGameJam/SpringGameJam/SpringGameJam.vcxproj
	SpringGameJam/SpringGameJam/SpringGameJam.vcxproj.filters
Update for BaseNPC and Spawner Files.