merge - moving forward
Merge

Conflicts:
	app/controllers/home_controller.rb