Merge branch 'master' into luke

Conflicts:
	app/controllers/application_controller.rb
	app/controllers/tournaments_controller.rb

1 files changed, 6 insertions, 0 deletions

diff --git a/Gemfile b/Gemfile
index 688063a..a34b0a6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,6 +8,12 @@ gem 'rails', '4.0.2'
 # bcrypt is used for password digesting
 gem 'bcrypt-ruby', '3.1.2'
 
+gem 'httparty'
+
+gem 'simple_captcha2', require: 'simple_captcha'
+
+#gem 'rmagick'
+
 group :development, :test do
 	# Use sqlite3 as the database for Active Record
 	gem 'sqlite3'