..
Merge branch 'master' of https://github.com/psvmc/psvmc.github.com.git
.
Merge branch 'master' of https://github.com/psvmc/psvmc.github.com.git

Conflicts:
	_posts/2014-10-24-git-pull-push.md