merging..
Merge branch 'master' of https://github.com/chamarapaul/classcartography-ios