changed controllers and views
Merge pull request #3 from mattdvhope/weekend_work

changed controllers and views