Fixing merge
Merge branch 'master' of github.com:corneljr/uncaptcha.me

Conflicts:
	app/controllers/home_controller.rb
	app/views/home/intro.html.erb