jquery
commit to merge
Merge branch 'master' of https://github.com/lletestu/TPResponsiveDesign

Conflicts:
	css/global.css