fuck
fuck again
Merge branch 'master' of https://github.com/qibinlou/BookstoreManagementSystem into qibinlou-master

Conflicts:
	bookcompany.db
	bookcompany/settings.pyc
	bookcompany/urls.pyc
	bookcompany/views.py
	bookcompany/views.pyc
	books/models.pyc
ddd