diff --git a/Gemfile b/Gemfile
index d026aa07..65c69e7e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -94,6 +94,7 @@ gem 'settingslogic'
 
 # Misc
 gem "foreman"
+gem 'gemoji', require: 'emoji/railtie'
 gem "git"
 
 group :assets do
diff --git a/Gemfile.lock b/Gemfile.lock
index 22842867..7dd69034 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -140,6 +140,7 @@ GEM
       sass-rails (>= 3.1.1)
     foreman (0.47.0)
       thor (>= 0.13.6)
+    gemoji (1.1.1)
     gherkin-ruby (0.2.1)
     git (1.2.5)
     github-linguist (2.3.4)
@@ -422,6 +423,7 @@ DEPENDENCIES
   ffaker
   font-awesome-sass-rails (~> 2.0.0)
   foreman
+  gemoji
   git
   github-linguist (~> 2.3.4)
   github-markup (~> 0.7.4)