Properly updated splash screen
Merge branch 'master' of https://github.com/azhao12345/Rabu-shiroi-gohan-matsuri

Conflicts:
	server.js