Merge pull request #70 from IanMayo/feature/alex/splash-screen

Splash screen stuff
Merge branch 'master' into feature/alex/splash-screen