shit
Merge branch 'master' of https://github.com/matthewljiang/Curiax_app into James_Wang

Conflicts:
	config/routes.rb