Completed SplashScreen. And checked User logic

I would still think it'd be a good idea for someone else to double my
double check of User logic (just to be safe).
merging Jens changes
Merge branch 'jennwu-master-1'