Giving Ruben his splash.png back after losing it
Merge commit '5efd0f3cfd00fc6483387d7fcf6478f1f0eb8289' into gh-pages
Merge branch 'gh-pages' of https://github.com/HammyHavoc/Cranky-Zombie into gh-pages

Conflicts:
	assets/splash.png