Octopress init
Merge branch 'gh-pages' of github.com:embs/blog into gh-pages

Conflicts:
	index.html