let the javascript begin [issue 42]
Fixed some JS
Merge branch 'jsFun'

Conflicts:
	index.html
	shiny.html