Changed Npc to NPC
Merge remote-tracking branch 'origin/master' into JuanBranch
NPC stuff
Merge remote-tracking branch 'origin/master' into JuanBranch
More NPC stuff

Got images to show up but background is not transparent
Two NPC's Printed out in normal scene
Merge remote-tracking branch 'origin/master' into JuanBranch
Going to start using Tiled
Merge remote-tracking branch 'origin/master' into JuanBranch

Conflicts:
	FinalProject/FinalProject/FinalProject.vcxproj.filters
	FinalProject/levels/testLevel.tmx
	FinalProject/src/Scene/NormalScene.cpp
	FinalProject/src/Scene/NormalScene.h
idk2
idk3
Merge remote-tracking branch 'origin/master' into JuanBranch

Conflicts:
	FinalProject/src/Manager/LevelManager.cpp
	FinalProject/src/Scene/NormalScene.cpp
need to get new master
Merge remote-tracking branch 'origin/master' into JuanBranch
So many Warnings
fixed
Fixed Warnings
Merge branch 'JuanBranch' of https://github.com/Chibin/The-Circle into JuanBranch
NPC's printed out but Buggy
NPCs displayed with collision

collision is working, but did it in a cheater kinda way instead of the
smart way.