Edited git ignore file to prevent merge conflicts.