Changed Particle.cpp
Nothing
Merge branch 'master' of https://github.com/gwalker91/GJSpringTeam4

Conflicts:
	SpringGameJam/Debug/SpringGameJam.ilk
	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/Particle.cpp
	SpringGameJam/SpringGameJam/SpringGameJam.vcxproj.filters
Added snow
Merge branch 'master' of https://github.com/gwalker91/GJSpringTeam4

Conflicts:
	SpringGameJam/SpringGameJam.sdf
	SpringGameJam/SpringGameJam.suo
Nothing
Merge branch 'master' of https://github.com/gwalker91/GJSpringTeam4

Conflicts:
	SpringGameJam/SpringGameJam/Debug/SpringGameJam.vcxprojResolveAssemblyReference.cache
Nothing
Merge branch 'master' of https://github.com/gwalker91/GJSpringTeam4

Conflicts:
	SpringGameJam/Debug/SpringGameJam.ilk
	SpringGameJam/Debug/SpringGameJam.pdb
	SpringGameJam/SpringGameJam.suo
	SpringGameJam/SpringGameJam/BaseNPC.cpp
	SpringGameJam/SpringGameJam/BaseNPC.h
	SpringGameJam/SpringGameJam/Debug/CL.read.1.tlog
	SpringGameJam/SpringGameJam/Debug/CL.write.1.tlog
	SpringGameJam/SpringGameJam/Debug/SpringGameJam.lastbuildstate
	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/mt.command.1.tlog
	SpringGameJam/SpringGameJam/Debug/mt.read.1.tlog
	SpringGameJam/SpringGameJam/Debug/mt.write.1.tlog
	SpringGameJam/SpringGameJam/Debug/rc.command.1.tlog
	SpringGameJam/SpringGameJam/Debug/rc.read.1.tlog
	SpringGameJam/SpringGameJam/Debug/rc.write.1.tlog
	SpringGameJam/SpringGameJam/Debug/vc100.idb
	SpringGameJam/SpringGameJam/Debug/vc100.pdb
	SpringGameJam/SpringGameJam/Spawner.cpp
	SpringGameJam/SpringGameJam/Spawner.h