Results are given in reverse order (newest at the top)
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/welcome_controller.rb