Initial add
Fix gitignore conflicts