Initial commit
Fix gitignore conflicts