added a .gitignore
Added rhistory folder to ignore list
Added a merge failure file.