Added all the basic settings Screens
Merge branch 'master' of https://github.com/jealas/Shiritori
merge