4.2
4.3
Merge branch 'master' of https://github.com/paomian/restaurant

Conflicts:
	.gitignore
	restaurant/db/restaurant.db
	restaurant/menu/admin.py
	restaurant/menu/models.py

	修改：      .gitignore
	修改：      README.md
	修改：      restaurant/menu/admin.py
	修改：      restaurant/menu/models.py