FIXED SHIT
Merge branch 'master' of https://github.com/matthewljiang/Curiax_app

Conflicts:
	app/controllers/homes_controller.rb
	config/routes.rb

Fixed shit