Updated Intellij settings
Merge branch 'master' of https://github.com/mhotan/dinnerplanner-html
Update Sandro and Mike views into one HTML

Created Menu Options and Dish portfolio view
Added .gitignore
Merge branch 'master' of https://github.com/mhotan/dinnerplanner-html into mhotan

Conflicts:
	.gitignore
Added uiEditor to .gitignore
Added Halit's views to the application.
Added some references to the main html
Updated Current Menu View to remove start button