solves merge conflicts
Merge pull request #28 from gladwearefriends/editing-styles

solves merge conflicts