added Flat model
merge
fixed typo in routes.rb