coming madhi's change
adding UI changes
Merge branch 'test-mahdi' into test-merge2

Conflicts:

IDK3/IDK3.xcodeproj/project.xcworkspace/xcuserdata/satoko.xcuserdatad/Us
erInterfaceState.xcuserstate
after merging Mahdi's changes
some UI changes
some UI changes
ignoring .xcuserstate files
Hopefully last time to commit .xcuserstate file
ignoring .xcuserstate file
ignoring .xcuserstate file
Merge branch 'test-merge2'

Conflicts:

IDK3/IDK3.xcodeproj/project.xcworkspace/xcuserdata/satoko.xcuserdatad/Us
erInterfaceState.xcuserstate