feedback on lab00 and lab01
resolving merge conflicts. someone beat me to the link