ben not making things work
Merge branch 'master' of github.com:josegonzalez/music-tour
Merge branch 'master' of github.com:josegonzalez/music-tour

Conflicts:
	public/app.css