init assignment 5
Merge branch 'master' of github.com:quiga/ios01