Generated App
Merge branch 'master' of github.com:jsononrails/soofoods

Conflicts:
	.gitignore