started rails app
rearranged files
rearranged files
merged