Initial commit
fix merge problem in gitignore