Added .gitignore. SHould help out greatly with conflicts