Updates
Merge branch 'master' of github.com:d4l3k/ubc-course
Woof