mid-way through lecture 1
Merge branch 'master' of github.com:fhurtubise/COMP
trying to figure out merge