Add optional splash screen, remove remnants of someone's bad merge.
Merge branch 'master' of https://github.com/jasonhutchens/DoctorSquad_MD