old changes
Merge branch 'master' of https://github.com/winteram/FashionPins
Minor changes