Added Magic and battle menu.bmp
Merge remote-tracking branch 'origin/Chibin's'

Conflicts:
	FinalProject/BattleScene.cpp
	FinalProject/FinalProject/FinalProject.vcxproj
	FinalProject/FinalProject/FinalProject.vcxproj.filters

	modified:   FinalProject/BattleManager.h
	modified:   FinalProject/BattleScene.cpp
	modified:   FinalProject/BattleScene.h
	modified:   FinalProject/Entity.h
	new file:   FinalProject/Images/Battle menu.bmp
	new file:   FinalProject/Magic.h