Merged stuff + added stuff.
Merge branch 'master' of https://github.com/IMS-445/IMS_Final

Conflicts:
	Assets/SchoolGirlPack/Animations/attack.anim
	Assets/SchoolGirlPack/Animations/idle.anim
	Assets/SchoolGirlPack/Animations/jump.anim
	Assets/SchoolGirlPack/Animations/run.anim
	Assets/SchoolGirlPack/Animations/walk.anim
	Assets/SchoolGirlPack/Models/hana/Materials/school girl03_02.mat
	Assets/SchoolGirlPack/Models/idle.anim
Merge branch 'master' of https://github.com/IMS-445/IMS_Final
Merge branch 'master' of https://github.com/IMS-445/IMS_Final
Fixed a bug in GameController
Merge branch 'master' of https://github.com/IMS-445/IMS_Final