diff --git a/Gemfile b/Gemfile
index e23e2ec..552db19 100644
--- a/Gemfile
+++ b/Gemfile
@@ -46,7 +46,9 @@ gem 'rest-client'
 group :test do
   gem 'rspec'
   gem 'rack-test', :require => "rack/test"
+  gem 'guard'
+  gem 'guard-unicorn'
 end
 
 gem 'newrelic_rpm'
-gem 'unicorn'
\ No newline at end of file
+gem 'unicorn'
diff --git a/Gemfile.lock b/Gemfile.lock
index 3a67611..8a6eb9c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -84,11 +84,17 @@ GEM
     erubis (2.7.0)
     faker (1.0.1)
       i18n (~> 0.4)
+    guard (1.3.2)
+      listen (>= 0.4.2)
+      thor (>= 0.14.6)
+    guard-unicorn (0.0.7)
+      guard (>= 1.1)
     hashr (0.0.21)
     hike (1.2.1)
     i18n (0.6.0)
     journey (1.0.4)
     kgio (2.7.4)
+    listen (0.5.0)
     method_source (0.8)
     mime-types (1.19)
     mongo (1.6.4)
@@ -138,6 +144,7 @@ GEM
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
+    thor (0.16.0)
     tilt (1.3.3)
     tire (0.4.2)
       activemodel (>= 3.0)
@@ -166,6 +173,8 @@ DEPENDENCIES
   delayed_job
   delayed_job_mongoid!
   faker
+  guard
+  guard-unicorn
   kaminari!
   mongo
   mongoid (~> 3.0)
diff --git a/Guardfile b/Guardfile
new file mode 100644
index 0000000..dc6b15a
--- /dev/null
+++ b/Guardfile
@@ -0,0 +1,13 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+## Sample template for guard-unicorn
+#
+# Usage:
+#     guard :unicorn, <options hash>
+#
+# Possible options:
+# * :daemonize (default is true) - should the Unicorn server start daemonized?
+# * :config_file (default is "config/unicorn.rb") - the path to the unicorn file
+# * :pid_file (default is "tmp/pids/unicorn.pid") - the path to the unicorn pid file
+guard :unicorn, :daemonize => false, :port => 4567