Update

Updated both laboration 1.1 and 1.2B