Added code to public in rails...
Merge branch 'master' of github.com:essos/hacksc

Conflicts:
	jukebox/public/script/script.js