Octopress init
Merge branch 'gh-pages' of github.com:colin-scott/music into gh-pages

Conflicts:
	index.html
Site updated at 2014-10-14 06:23:20 UTC