added Splasher screen
try to merge splasher into master
Fix Splasher to use /resources/loading.gif as a URL
rm --cached .DS_Store
trying to merge w/unresolved conflicts using commit -am