Test commit
Merge branch 'master' of https://github.com/themyth92/FYP

Conflicts:
	Project/bin-debug/GameDev.swf
	Project/src/Screens/LoadingScreen/TextureLoader.as
	Project/src/assets/Assets.as
	Project/src/constant/Constant.as
	Project/src/object/LoaderObject.as