Initial Commit
fix gitignore conflicts