Merge branch 'Updated-Splash'
thickened body weight
ignoring espresso file
damn you espresso!
ignoring espresso... again
... and again
updated gitignore
changed splash copy
added sleepbit folder
Merge branch 'Updated-Splash'

Conflicts:
	index.html
	oscvr.github.io.esproj/user.oscvr.espressostorage
	styles/main.css
Merge branch 'master' into Updated-Splash