Valerie merge

One merge to merge them all
Merge branch 'master' of https://github.com/UWPSE2014/KenoshaAreaTransit

Conflicts:
	KenoshaAreaTransit.xcodeproj/project.pbxproj

KenoshaAreaTransit.xcodeproj/project.xcworkspace/xcuserdata/valeriebergl
ind.xcuserdatad/UserInterfaceState.xcuserstate
	KenoshaAreaTransit/Base.lproj/Main_iPhone.storyboard