init
Merge branch 'master' of https://github.com/tortillaj/simple_dessert

Conflicts:
	.gitignore