Updates following meeting
Merge branch 'master' of https://github.com/rogers4815/clockworksDSA.git