Initial commit
Merge branch 'master' of https://github.com/drewbanin/pizza-button

Conflicts:
	.gitignore