updated git ignore file so we don't have merge conflicts