Octopress init
Merge branch 'master' of github.com:nevern02/nevern02.github.io

Conflicts:
	index.html
Site updated at 2014-12-06 18:19:12 UTC