JQuery

Setup de JQuery
Test
Merge branch 'test'

Conflicts:
	script.js