there were some conflicts when i pulled and merged, i guess everything is now good, we will be using the resourceful routing, take a look at the config/ routes.rb