adding rails
Merge branch 'dev'