removed old timeline code
move around some other code
Merge branch 'master' of github.com:josegonzalez/music-tour

Conflicts:
	public/app.js