Adding final files to task05
added task 06 details
Merge branch 'master', remote-tracking branch 'upstream/master'