Merge branch 'master' into macbook-branch
added available_time field to courses db and added time conversion to insert statement
Merge branch 'webs-web1dev' into macbook-branch
Merge pull request #29 from californiavol/macbook-branch

Macbook branch