Update GUI
Merge branch 'master' of https://github.com/tienc40/Orthopaedic

Conflicts:
	Orthopaedic.xcodeproj/project.pbxproj
	Orthopaedic/Base.lproj/Main.storyboard