initial commit, adding misc. files
fix merge conflict with .gitignore file between github and rstudio