Testing push to see if Github is screwed up again.
Ryan: Testing to see if github is screwed up again.
Merge branch 'master' of http://www.github.com/JakeWaffle/LCSC-Campus-Life

Conflicts:
	LCSC Campus Life.xcodeproj/project.pbxproj
Merge branch 'master' of http://www.github.com/JakeWaffle/LCSC-Campus-Life