undo previous
Merge branch 'settings' of https://github.com/Zeega/Zeega into settings