Starting
Merge remote-tracking branch 'origin/master' into JuanBranch
Merge branch 'JuanBranch' of https://github.com/Chibin/The-Circle into JuanBranch

Conflicts:
	FinalProject/Entity.h
	FinalProject/FinalProject/FinalProject.vcxproj
	FinalProject/src/Scene/OpeningScene.cpp