assigment 2.2 stuff
Merge branch 'master' of github.com:kiniry/objective-c