add settings
Merge branch 'master' of https://github.com/adrianblp/onewordstory
Merge remote-tracking branch 'origin/master' into controllercode