sing "Titanium"
sing hello, goodbye
Merge branch 'dguetta'

Conflicts:
	js/hello.js