Testing Javascript
Fixed JavaScript!
Merge branch 'testingjavascript'

Conflicts:
	Hangout/hello-study-world.xml