remove .gitingore~ and rename ' .gitignore'
merge