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

Conflicts:
	apple-touch-icon-precomposed.png
	index.html