.gitignore : ignore conf files
gitignroe : ignore deploymnet specific files
Merge remote-tracking branch 'upstream/master'
Merge pull request #3 from sujee/master

.gitignore : ignore conf files