first commit
Merge branch 'master' of https://github.com/AnneSophieRowr/nespresso

Conflicts:
	.gitignore