stuff
Merge branch 'master' of https://github.com/bennibrightside/BBInputBar

Conflicts:

BBInputBar.xcodeproj/project.xcworkspace/xcuserdata/Benni.xcuserdatad/Us
erInterfaceState.xcuserstate