Added the initial batch of files
Fixed the conflict in .gitignore file