u
Merge branch 'master' of github.com:guillaume-gouchon/pizzasSwag

Conflicts:
	js/script.js