Week12

last changes on Week11P5 and commit of Week12