a
Merge branch 'master' of github.com:jhou1/foxhound

Conflicts:
	config/schedule.rb