diff --git a/TwitterHipster/.DS_Store b/TwitterHipster/.DS_Store
new file mode 100644
index 0000000..fadd49a
Binary files /dev/null and b/TwitterHipster/.DS_Store differ
diff --git a/TwitterHipster/Gemfile b/TwitterHipster/Gemfile
index 5df67fb..34c33e4 100644
--- a/TwitterHipster/Gemfile
+++ b/TwitterHipster/Gemfile
@@ -2,6 +2,14 @@ source 'https://rubygems.org'
 
 gem 'rails', '3.2.9'
 
+gem 'omniauth'
+gem 'omniauth-twitter'
+gem 'couchbase', '>= 1.2.0.z.beta3'
+gem 'couchbase-model'
+gem 'masonry-rails'
+gem 'grackle'
+
+
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
 
diff --git a/TwitterHipster/Gemfile.lock b/TwitterHipster/Gemfile.lock
index 2b1d17b..621fbcf 100644
--- a/TwitterHipster/Gemfile.lock
+++ b/TwitterHipster/Gemfile.lock
@@ -37,9 +37,19 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.4.0)
+    couchbase (1.2.0.z.beta5)
+      multi_json (~> 1.0)
+      yaji (~> 0.3.2)
+    couchbase-model (0.5.1)
+      couchbase (~> 1.2.0.dp)
     erubis (2.7.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
+    grackle (0.2.1)
+      json
+      mime-types
+      oauth
+    hashie (1.2.0)
     hike (1.2.1)
     i18n (0.6.1)
     journey (1.0.4)
@@ -51,8 +61,20 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
+    masonry-rails (0.1.8)
+      rails
     mime-types (1.19)
     multi_json (1.5.0)
+    oauth (0.4.7)
+    omniauth (1.1.1)
+      hashie (~> 1.2)
+      rack
+    omniauth-oauth (1.0.1)
+      oauth
+      omniauth (~> 1.0)
+    omniauth-twitter (0.0.14)
+      multi_json (~> 1.3)
+      omniauth-oauth (~> 1.0)
     polyglot (0.3.3)
     rack (1.4.1)
     rack-cache (1.2)
@@ -98,13 +120,20 @@ GEM
     uglifier (1.3.0)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
+    yaji (0.3.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   coffee-rails (~> 3.2.1)
+  couchbase (>= 1.2.0.z.beta3)
+  couchbase-model
+  grackle
   jquery-rails
+  masonry-rails
+  omniauth
+  omniauth-twitter
   rails (= 3.2.9)
   sass-rails (~> 3.2.3)
   uglifier (>= 1.0.3)
diff --git a/TwitterHipster/config/couchbase.yml b/TwitterHipster/config/couchbase.yml
new file mode 100644
index 0000000..cda67d4
--- /dev/null
+++ b/TwitterHipster/config/couchbase.yml
@@ -0,0 +1,23 @@
+common: &common
+  hostname: localhost
+  port: 8091
+  username:
+  password:
+  pool: default
+
+development:
+  <<: *common
+  bucket: twitter_hipster_development
+
+test:
+  <<: *common
+  bucket: twitter_hipster_test
+
+# set these environment variables on your production server
+production:
+  hostname: <%= ENV['COUCHBASE_HOST'] %>
+  port: <%= ENV['COUCHBASE_PORT'] %>
+  username: <%= ENV['COUCHBASE_USERNAME'] %>
+  password: <%= ENV['COUCHBASE_PASSWORD'] %>
+  pool: <%= ENV['COUCHBASE_POOL'] %>
+  bucket: <%= ENV['COUCHBASE_BUCKET'] %>