Merge branches 'master' and 'master' of https://github.com/Hare8563/iPhoneApp
Merge branch 'master' of https://github.com/Hare8563/iPhoneApp