Initial commit
Merge branch 'master' of github.com:robertkein/dieta

Conflicts:
	.gitignore