fixed few mistakes made while merging

There were few mistakes in the application.

1. It is not able to run rake db:seed properly due to some syntax error.
2. There is some mistake in routes.rb file when you merged the code. This is halting rails server to start.