Initial configuration commit
Merge https://github.com/newmanth/git-test