Made settings page
Merge branch 'master' of https://github.com/Rabmuk/Teem