deleted settings. some refactoring
Merge branch 'master' of https://github.com/adebasi/ttv-lab2