blah
Merge branch 'serverside' of https://github.com/VReality64/Pancake into serverside

Conflicts:
	app/scripts/playslider.js
rootscoping everything