Inital Commit
fix merge conficts in .gitignore