styleing
Merge branch 'style-rodrigo'

* style-rodrigo:
  styleing
ruby version
merge confilcs resolved