first commit of the app
Merge branch 'master' of github.com:silviurosu/admin.diningchicago

Conflicts:
	.gitignore