Commit final versions for lab1 and lab2 stuff