First commit
fix gitignore conflicts