Make it so
Merge .gitignore