changed controller logic
merged
Merge branch 'master' of github.com:davidgbe/scheduler

update .gitignore