Adding .ruby-version file
WIP
Merging & Resolving conflicts