created files and folders from 'rvm --create use 2.1.2@entitomy' and 'bundle gem entitomy'
merging conflicts