Working on scheduling function
Merge branch 'master' of https://github.com/jennyallen/diybootcamp
Swapped some things around