Merge branch 'master' of https://github.com/cmsi/vcs-hands-on