c
Merge branch 'master' of https://github.com/ustari28/fs

Conflicts:

FashopApp/FashopApp.xcworkspace/xcuserdata/alangabriel.xcuserdatad/UserI
nterfaceState.xcuserstate