add
Merge branch 'master' of https://github.com/MoeMoon/activitys

Conflicts:
	ourevents/2014-10-18.md
增加我们组织的头像