new settins added
Merge branch 'master' of https://github.com/neranga/practical1.git