favorites
Merge branch 'working' of https://github.com/kevinzhoucn/mongo_jzcnw into working

Conflicts:
	config/routes.rb
reply