added task2
Merge branch 'master' of https://github.com/nemesyslab/ee1001_May17