Merge branch 'master' of /Users/rbrunschwiler/Documents/github/looping-louie with conflicts.
splash screen