updated L04, added L05 exercise
Merge branch 'localtest'