init commit
fixed gitignore conflicts