add background image to normal scene
Merge remote-tracking branch 'origin/master' into normalScene
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