salah
Merge branch 'master' of https://github.com/imaammdev/bookstore

Conflicts:
bookstore.xcodeproj/project.pbxproj

bookstore.xcodeproj/project.xcworkspace/xcuserdata/hermantolle.xcuserdat
ad/UserInterfaceState.xcuserstate
bookstore/Base.lproj/Main_iPhone.storyboard
bookstore/homeViewController.m
bookstore/magazineView.m
bookstore/menuUtama.m
cobalagi