Merging the schedule test
made some changes to the schedule
Merge branch 'master' of https://github.com/iainworkman/370Project
Finished the schedule test