Setting up rails
merge