switched from rvmrc to ruby-version
time selection in 15 min steps
resolved merge conflict