rollback
Merge branch 'master' of github.com:RockyNiu/Ubuntu1404Manual

Conflicts:
	Ubuntu1404Manual/__NOTEBOOK__/index.sqlite