Update notes
new post
Merge branch 'economy'

Conflicts:
	notes/写给无神论者.md