first commit
Initial commit
Adding .gitignore
Resolved conflicts in auto generated .gitignore file