adds rvmrc file
merge conflicts