Trying jQuery
Merge branch 'trying-jQuery'

Conflicts:
	codeTesting/app.js