Initial commit
Fix conflict in gitignore