add background image to normal scene
Merge remote-tracking branch 'origin/master' into normalScene
updated psd
animation in all four direction
animation now stops properly. beginning to update player position
Merge remote-tracking branch 'origin/master' into normalScene

Conflicts:
	FinalProject/src/Scene/NormalScene.cpp
	FinalProject/src/Scene/NormalScene.h
some changes
player can move the character around
updated some battle stuff
disable loading for now and update battle scene to exit to normal scene
Merge branch 'master' of https://github.com/Chibin/The-Circle
changed normal scene closed on esc.

move back to menu instead
press c to start a battle
temp changes to make animation "smoother"
slowed down LITERALLY directional animation
meh..temporary fix(maybe perm) for slow directional turn
better test map to use
the libraries...so much
removed svn in include...PARSING LVL WORKS
Merge remote-tracking branch 'origin/master' into JuanB

Conflicts:
	FinalProject/FinalProject/FinalProject.vcxproj.filters
	FinalProject/src/Manager/LevelManager.h
	FinalProject/src/Scene/NormalScene.cpp
	FinalProject/src/Scene/NormalScene.h