new data
Merge branch 'master' of https://github.com/gosuvn/IdealPad

Conflicts:

IdealPad.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserI
nterfaceState.xcuserstate