removed temp files created by school mac
Merge branch 'master' of https://github.com/JohnPease/CS658-iOS
almost done