ignore idea config
Merge branch 'master' of https://github.com/wangyj0898/wangyj0898.github.io

Conflicts:
	.idea/workspace.xml
modified post.html