Updates
Merge branch 'master' of https://github.com/sdmunoz/BookTemplate

Conflicts:

BookTemplate/BookTemplate.xcodeproj/project.xcworkspace/xcuserdata/munoz
.xcuserdatad/UserInterfaceState.xcuserstate