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

Conflicts:
	ClassCartography/ClassCartography.xcodeproj/project.pbxproj