Octopress init
Site updated at 2014-05-18 19:33:45 UTC
Merge branch 'gh-pages' of github.com:colin-scott/music into gh-pages

Conflicts:
	assets/css/bootstrap.css
	atom.xml