Update task 4 and task 5
Merge branch 'master' of https://github.com/omaromeir/stat540-2014-project