Initial commit
Changed .gitignore
Merged .gitignore