in the root directory, type ruby tools/pimp_my_routes.rb to realign the conf/routes file
Merge remote-tracking branch 'origin/master'