Adding assignments 6 and 7
Merge pull request #223 from microcake/master

Adding assignments 6 and 7