Testing the commit in alextang96
Merge branch 'master' of https://github.com/alextang96/FYP

Conflicts:
	FYP/src/com/example/maptest/SplashScreen.java