Changed .gitignore
Removed configuration files
Merge origin/master