Works from scratch

Added .gitignore
Fixed conflicts