new post
Merge branch 'master' of github.com:wgui1/wgui1.github.io

Conflicts:
	_posts/2014-06-29-sprint-boot-security-problem-with-war.markdown