Merge branch 'Chris's-Branch'

Conflicts:
MedLight/MedLight.xcodeproj/project.pbxproj

MedLight/MedLight.xcodeproj/project.xcworkspace/xcuserdata/christophergu
tierrez.xcuserdatad/UserInterfaceState.xcuserstate
MedLight/MedLight/Base.lproj/Main.storyboard