working on settings
Merge branch 'develop' of github.com:vmrob/poemarket into develop