First commit. Blank rails app
Fixed merging issues