adding task3 and 4
Merge branch 'master' of https://github.com/alplecture2014/alp2014