update
Merge branch 'master' of https://github.com/Svtter/MyBlog

Conflicts:
	planList/2014年8月份日常记录表.md