version locks
Merge branch 'master' of github.com:erichwelz/hartl_2
Redoing Hartl