changing some times
updated some times
Merge branch 'master' of github.com:brandon-dacrib/cloverleaf

Conflicts:
	app/config/schedule.rb