scrolling and tap recognizers
stuff
Merge branch 'formatting'

Conflicts:

StupidDictionary.xcodeproj/project.xcworkspace/xcuserdata/Anjali.xcuserd
atad/UserInterfaceState.xcuserstate