first commit with egit
Merge branch 'dev_thinkpad'

Conflicts:
	mysite/settings.pyc
commit master branch by thinkpad on 20140921
Merge branch 'dev_thinkpad'

Conflicts:
	books/models.pyc
ignore file change
test
Delete .models.py.swp
Delete __init__.pyc
Delete models.pyc
Delete __init__.pyc
Delete settings.pyc
Delete settings.py~
Delete urls.pyc
Delete views.py.bak0916
Delete views.pyc
Delete views.py~
Delete wsgi.pyc
test del unuse file
Merge branch 'master' of github.com:huachen0216/mysite

# By huachen0216
# Via huachen0216
* 'master' of github.com:huachen0216/mysite:
  Delete wsgi.pyc
  Delete views.py~
  Delete views.pyc
  Delete views.py.bak0916
  Delete urls.pyc
  Delete settings.py~
  Delete settings.pyc
  Delete __init__.pyc
  Delete models.pyc
  Delete __init__.pyc
  Delete .models.py.swp
last commit on 20140921 with thinkpad.