a
Merge branch 'dev' of https://github.com/joeygurl/BookLibrary into dev

Conflicts:

BookLibrary.xcodeproj/project.xcworkspace/xcuserdata/dramos.xcuserdatad/
UserInterfaceState.xcuserstate