making sure we have a working copy of lab3
Merge branch 'master' of github.com:lrbloch/18349