7th commit
Merge branch 'master' of https://github.com/paul80/assignment1