fixed conflict
Merge branch 'master' of https://github.com/CDSteer/cs235group3a5

Conflicts:
	src/SplashScreen.java