Rebasing two commits in the middle of the tree
added rails file