Second initial commit
Merge branch 'master' of github.com:lmcmenemie/pizza

Conflicts:
	.gitignore
Merge branch 'master' of github.com:lmcmenemie/pizza

Conflicts:
	.gitignore