Merge branch 'master' into origin-master

Conflicts:
	app/controllers/guesses_controller.rb
Merge branch 'origin-master'