made some changes to splash
Merge branch 'master' of github.com:oc-cs170/feed-me
Doing some work on the splash screen
Conflicts:
	feed-me.py