Added the gitignore
merge