aaa
Merge branch 'master' of https://github.com/billyduc/trique

Conflicts:
	src/documents/index.html.jade
	src/documents/scripts/script.js.coffee
	src/files/vendor/css/style.css
	src/layouts/default.html.jade
Lam commit
commit jquery
Merge branch 'master' of https://github.com/billyduc/trique

Conflicts:
	src/documents/index.html.jade