Added .gitignore to hopefully help these merge problems