committing alarm clock
Merge pull request #3 from hwray/brian-categories

linking categories page
Merge branch 'master' of https://github.com/hwray/discoveroute into alarmclock

Conflicts:
	public/javascripts/index.js
alarm cock aaron
fix merge conflict
Merge pull request #5 from hwray/fix-merge-conflict

fix merge conflict
add interaction sidebar
Merge pull request #6 from hwray/fix-merge-conflict

add interaction sidebar
Added route fields and time to sidebar.
categories