ummm
Merge branch 'master' of https://github.com/dbpc/LunchApp

Conflicts:
	WebApplication1/Controllers/ValuesController.cs
	WebApplication1/Scripts/app.js
	WebApplication1/Views/Home/Index.cshtml