Initial revision
Added .gitignore
Fixed conflicts in .gitignore