D

D
Merge branch 'master' of https://github.com/globalelectric/PryTem

Conflicts:

PTM/PTM.xcodeproj/project.xcworkspace/xcuserdata/ipatient.xcuserdatad/Us
erInterfaceState.xcuserstate