1.0
2.0
Merge https://github.com/paomian/restaurant

Conflicts:
	.gitignore