onclick debug
Google search onclick
Merge remote-tracking branch 'origin/martin'

Conflicts:
	wordcloud.js