added rails app to the repository
merged contents