fish更新了大家都懂的内容-4.2.6
fish更新了大家都懂的内容-4.2.6，增加了联系人自动更新
Merge remote-tracking branch 'update/master'

Conflicts:
	README.md
4.2.8，越来越不保险了
Merge remote-tracking branch 'update/master'
4.2.9，资源转移到了liebao.cn
4.3.1,增加往程、返程和改签
Merge remote-tracking branch 'update/master'
4.3.3?
Merge branch 'master' of https://github.com/mbin/12306_ticket_helper
create branch projectized.
fix git ignore config for MacOS.
change .gitignore file. block MacOS .DS_Store directory.
clean up master branch.
ready to move content page to wiki.
wiki initialized.
Merge pull request #1 from lurongkai/master

update