Added gitignore
Resolved conflicts
Initial import