removing the local setting file committed, and refactoring
Merge pull request #6 from tikaa/master

removing the local setting file committed, and refactoring