commit with work lenovo
edit ignore file
Merge branch 'master' of github.com:huachen0216/mysite

Conflicts:
	books/admin.py
	books/models.py
	mysite/settings.py
	mysite/settings.py~
	mysite/views.py
	mysite/views.py.bak0916
	mysite/views.py~
	templates/dateapp/current_datetime.html.bak
	templates/dateapp/current_datetime.html~