Commiting to fetch from upstream
Merged with upstream, just had a conflict with a .xcodeproj file
Changing to merge upstream
Merged upstream
Splash is black and white, no more orb
Merge pull request #467 from stowellm/ms466

Splash is black and white, no more orb