Project setup
Merged .gitignore