added new controllers
Merge branch 'master' of https://github.com/BucknellITEC/Dashboard

Pulling in my controller changes