my first blog (here)
continued
Merge branch 'master' of https://github.com/wm65/wm65.github.io.git

Conflicts:
	_posts/2014-03-03-setup-github.md