starting work on advancing forward/backward
Merge branch 'master' of github.com:josegonzalez/music-tour

Conflicts:
	public/app.js
adding controls to step forward/backward
Merge branch 'master' of github.com:josegonzalez/music-tour

Conflicts:
	views/map.erb