增加了model
Merge branch 'master' of github.com:zcbhaha/yanfenghupo

Conflicts:
	main/__init__.pyc
	main/models.py
	main/views.pyc
	yanfenghupo/__init__.pyc
	yanfenghupo/settings.pyc
	yanfenghupo/urls.pyc
	yanfenghupo/wsgi.pyc