more routes
Merge branch 'master' of github.com:erikosmond/nPlus

Conflicts:
	config/routes.rb
routes