Reduced time of sample data slightly, added team challenges back to course form
Merge pull request #822 from UM-USElab/course-challenges

Reduced time of sample data slightly, added team challenges back to cour...