typo
typo2

Merge branch 'master' of https://github.com/gcorre02/R_JQuery_Project

Conflicts:
	inst/www/helloWorld.js