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

Conflicts:
	ClassCartography/ClassCartography/Classes/ViewControllers/LoginViewController.m