Initial commit
Merge branch 'master' of github.com:sinourain/distrivendingapp

Conflicts:
	.gitignore
Merge branch 'master' of github.com:sinourain/distrivendingapp

Conflicts:
	.gitignore