Hackathon version.
Merge remote-tracking branch 'origin/master'

Conflicts:
	RoomMate.xcodeproj/project.xcworkspace/xcuserdata/alex.xcuserdatad/UserInterfaceState.xcuserstate