fixed merge
made some unfinished changes to Course.java (added a time field) (10
min)
got a start on Create course servlet (1h)