Merge branch 'master' of https://github.com/Team-Polka-Fusion/ProtectThePeople

Conflicts:
	Protect_The_People/Debug/Project.exe
	Protect_The_People/Debug/Project.ilk
	Protect_The_People/Debug/Project.pdb
	Protect_The_People/Project.sdf
	Protect_The_People/Project.v11.suo
	Protect_The_People/Project/Debug/CL.read.1.tlog
	Protect_The_People/Project/Debug/CL.write.1.tlog
	Protect_The_People/Project/Debug/Game.obj
	Protect_The_People/Project/Debug/GameManager.obj
	Protect_The_People/Project/Debug/Main.obj
	Protect_The_People/Project/Debug/Project.Build.CppClean.log
	Protect_The_People/Project/Debug/Project.lastbuildstate
	Protect_The_People/Project/Debug/Project.log
	Protect_The_People/Project/Debug/cl.command.1.tlog
	Protect_The_People/Project/Debug/link.11520.read.1.tlog
	Protect_The_People/Project/Debug/link.11520.write.1.tlog
	Protect_The_People/Project/Debug/link.14228-cvtres.read.1.tlog
	Protect_The_People/Project/Debug/link.14228-cvtres.write.1.tlog
	Protect_The_People/Project/Debug/link.14228-rc.read.1.tlog
	Protect_The_People/Project/Debug/link.14228-rc.write.1.tlog
	Protect_The_People/Project/Debug/link.14228.read.1.tlog
	Protect_The_People/Project/Debug/link.14228.write.1.tlog
	Protect_The_People/Project/Debug/link.64404-cvtres.read.1.tlog
	Protect_The_People/Project/Debug/link.64404-cvtres.write.1.tlog
	Protect_The_People/Project/Debug/link.64404-rc.read.1.tlog
	Protect_The_People/Project/Debug/link.64404-rc.write.1.tlog
	Protect_The_People/Project/Debug/link.command.1.tlog
	Protect_The_People/Project/Debug/link.read.1.tlog
	Protect_The_People/Project/Debug/link.write.1.tlog
	Protect_The_People/Project/Debug/vc110.idb
	Protect_The_People/Project/Debug/vc110.pdb
Merge branch 'master' of https://github.com/Team-Polka-Fusion/Sun-Titled-Nazar

Conflicts:
	STNazar.swf