Revert "Merge branch 'master' of https://github.com/gutierc2/MedLight"

Conflicts:
	MedLight.xcodeproj/project.xcworkspace/xcshareddata/MedLight.xccheckout
	MedLight/Base.lproj/Main.storyboard