Merge branch 'master' of https://github.com/sxmatch/sxmatch.github.io
Merge branch 'master' of https://github.com/sxmatch/sxmatch.github.io

Conflicts:
	_posts/2014-3-3-Hello-World.md