trying to add git ignore file
trying to make ignore file
trying to merge again