work on settings
Merge branch 'develop' of https://github.com/sdh16/dometro into develop