adds git ignore files
something is wrong with merge?