first part of assignment3
Merge branch 'master' of https://github.com/kiniry/objective-c