server
Merge branch 'master' of github.com:oliland/runforit
Merge branch 'master' of github.com:oliland/runforit

Conflicts:
	runForIt.xcodeproj/project.xcworkspace/xcshareddata/runForIt.xccheckout
	runForIt/ServerCommunication.m
	runForIt/User.h