default page
Merge branch 'master' of https://github.com/ryanivanka/YummyDev

Conflicts:
	.idea/workspace.xml
	views/foods.html
Merge branch 'master' of https://github.com/ryanivanka/YummyDev

Conflicts:
	.idea/workspace.xml
	views/foods.html
Merge branch 'master' of https://github.com/ryanivanka/YummyDev

Conflicts:
	.idea/workspace.xml
	views/foods.html
Merge branch 'master' of https://github.com/ryanivanka/YummyDev

Conflicts:
	.idea/workspace.xml
	views/foods.html
Merge branch 'master' of https://github.com/ryanivanka/YummyDev

Conflicts:
	.idea/workspace.xml