committing alarm clock
Merge branch 'master' of https://github.com/hwray/discoveroute into alarmclock

Conflicts:
	public/javascripts/index.js
alarm cock aaron