commit now
Merge branch 'master' of https://github.com/alexiszorba/pizza-shop.git

Conflicts:
	.gitignore