settings (INCOMPLETE)
Merge branch 'master' of https://github.com/dbvictor/bananas
settings activity working