Finished

Product
Merge branch 'Zc'
Merge branch 'master' of https://github.com/zrosenbauer/IOS_Class_Project1