bug lab6 beta basic
Merge branch 'master' of github.com:dutra/6004