commit with 20140918
home commit second
ignore change with lenovo dev
ignore with lenovo dev
lenovo dev 20140919
ignore change
commit with lenovo
Merge branch 'dev_lenovo'

* dev_lenovo:
  commit with lenovo
  ignore change
  lenovo dev 20140919
  ignore with lenovo dev
  ignore change with lenovo dev
  20140918 second commit
  20140918 second commit
  20140918 first commit
  20140918 first commit
Merge branch 'dev'

* dev:
  home commit second
  commit with 20140918

Conflicts:
	books/models.py
	mysite/settings.py
	mysite/settings.pyc