Initial setup
Merged gitignore