added splash screen
fixing merge conflicts
Merge branch 'master' of https://github.com/csci477-team4/pearsports-android