Adding the .gitignore file
Removing files that aren't needed in the repo and adding a .gitignore file
Merging