Initial commit
Merge branch 'master' of https://github.com/LazyWaiter/Waiter

Conflicts:
	app/index.html