commit
Merge branch 'master' of https://github.com/Que20/inMyKitchen

Conflicts:

inMyKitchen/inMyKitchen.xcodeproj/project.xcworkspace/xcuserdata/mac.xcu
serdatad/UserInterfaceState.xcuserstate

inMyKitchen/inMyKitchen.xcodeproj/xcuserdata/mac.xcuserdatad/xcdebugger/
Breakpoints_v2.xcbkptlist
commit
commit