Adding Settings screen
Merge branch 'master' of git@github.com:smallpotato99/demo.git