Adding settings
Merge branch 'master' of https://github.com/FChirwa/myschool
Adding navigation tabs