fhjh
Merge branch 'pr/1'

Conflicts:

MY_Magazine.xcodeproj/project.xcworkspace/xcshareddata/MY_Magazine.xcche
ckout