created event scene
have images set up for event scene
Merge branch 'refs/heads/eventScene'
Text scrolling now implemented for battle

pressing z will immediately draw all the text, while waiting slowly
draws all the text image.
messing around with events
moved playerinfo in normal scene into right place
Merge remote-tracking branch 'origin/eventScene'
message
Merge branch 'master' of https://github.com/Chibin/The-Circle
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