Added gitignore
Merge fixes I think...