module a
Merge branch 'master' of https://github.com/TeamCHC/ios

Conflicts:

assignment2/assignment2.xcodeproj/project.xcworkspace/xcshareddata/assig
nment2.xccheckout
a