first commit rails
first merge