adding git ignore
Resolving some conflicts?