taskG-1
clean route.rb
merge master with origin_master
merge master with github_master