Merge branch 'mcnamara/api' of https://github.com/cs27x/SchoolCraig_iOS into feat/postingCell

Conflicts:
	SchoolCraig.xcodeproj/project.pbxproj
Merge branch 'feat/postingCell' of https://github.com/cs27x/SchoolCraig_iOS into feat/postingCell

Conflicts:
	SchoolCraig.xcodeproj/project.pbxproj