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

Conflicts:
	.gitignore
	_posts/2014-11-29-welcome-to-jekyll.markdown
567