A fresh install of Rails and Spree
Merge branch 'master' of https://github.com/blakesmusic/blakessheetmusic

Conflicts:
	.gitignore