Undoing accidental branch replacement

.env.example

@@ -1,3 +1,8 @@
 SECRET_TOKEN=
 MANDRILL_USER_NAME=
 MANDRILL_APIKEY=
+DATABASE_NAME=
+DATABASE_USERNAME=
+DATABASE_PASSWORD=
+DEPLOY_SERVER=
+DEPLOY_USERNAME=

Gemfile

@@ -8,37 +8,42 @@ gem 'rails', '4.1.0'
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
 
 gem 'haml'
-#gem 'feedjira'
+gem 'feedjira'
 gem 'rails_admin'
 gem 'rabl'
 gem 'dotenv-rails', :groups => [:development, :test, :production]
-gem 'ckeditor'
 
 # Gems used only for assets and not required
 # in production environments by default.
 gem 'sass-rails'
 gem 'compass-rails'
-gem 'autoprefixer-rails'
 
 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
 # gem 'therubyracer', :platforms => :ruby
 
 gem 'uglifier', '>= 1.0.3'
 
 group :development do
-  gem 'mysql2'
   gem 'debugger'
 end
 
+group :development, :production do
+  gem 'mysql2'
+end
+
 group :test, :development do
   gem 'sqlite3'
 end
 
-group :production do
+group :staging do
   gem 'rails_12factor'
   gem 'pg'
 end
 
+group :production do
+  gem 'therubyracer', :platforms => :ruby
+end
+
 gem 'jquery-rails'
 
 # To use ActiveModel has_secure_password

Gemfile.lock

@@ -28,8 +28,6 @@ GEM
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
     arel (5.0.1.20140414130214)
-    autoprefixer-rails (1.1.20140410)
-      execjs
     bcrypt-ruby (3.1.2)
     builder (3.2.2)
     capistrano (2.15.4)
@@ -39,9 +37,6 @@ GEM
       net-ssh (>= 2.0.14)
       net-ssh-gateway (>= 1.1.0)
     chunky_png (1.3.0)
-    ckeditor (4.0.11)
-      mime-types
-      orm_adapter (~> 0.5.0)
     coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
@@ -50,12 +45,14 @@ GEM
       execjs
     coffee-script-source (1.7.0)
     columnize (0.3.6)
-    compass (0.12.5)
+    compass (0.12.6)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.2.19)
-    compass-rails (1.1.6)
+    compass-rails (1.1.7)
       compass (>= 0.12.2)
+      sprockets (<= 2.11.0)
+    curb (0.8.5)
     debugger (1.5.0)
       columnize (>= 0.3.1)
       debugger-linecache (~> 1.2.0)
@@ -74,6 +71,10 @@ GEM
     erubis (2.7.0)
     excon (0.16.10)
     execjs (2.0.2)
+    feedjira (1.2.0)
+      curb (~> 0.8.1)
+      loofah (~> 1.2.1)
+      sax-machine (~> 0.2.1)
     font-awesome-rails (4.0.3.1)
       railties (>= 3.2, < 5.0)
     fssm (0.2.10)
@@ -91,6 +92,9 @@ GEM
     kaminari (0.15.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
+    libv8 (3.16.14.3)
+    loofah (1.2.1)
+      nokogiri (>= 1.4.4)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
@@ -158,6 +162,7 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.3.1)
+    ref (1.0.5)
     remotipart (1.2.1)
     safe_yaml (1.0.3)
     sass (3.2.19)
@@ -166,6 +171,8 @@ GEM
       sass (~> 3.2.0)
       sprockets (~> 2.8, <= 2.11.0)
       sprockets-rails (~> 2.0)
+    sax-machine (0.2.1)
+      nokogiri (~> 1.6.0)
     sprockets (2.11.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -176,6 +183,9 @@ GEM
       activesupport (>= 3.0)
       sprockets (~> 2.8)
     sqlite3 (1.3.7)
+    therubyracer (0.12.0)
+      libv8 (~> 3.16.14.0)
+      ref
     thor (0.19.1)
     thread_safe (0.3.3)
     tilt (1.4.1)
@@ -194,13 +204,12 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  autoprefixer-rails
   capistrano
-  ckeditor
   compass-rails
   debugger
   devise
   dotenv-rails
+  feedjira
   haml
   jquery-rails
   mandrill-api
@@ -212,4 +221,5 @@ DEPENDENCIES
   rails_admin
   sass-rails
   sqlite3
+  therubyracer
   uglifier (>= 1.0.3)

README.md

@@ -1,4 +1,4 @@
-adalandlily
+jeffreyandanna
 ==============
 
-The wedding website for Adal and Lily!
+The joint website for Jeffrey and Anna!

Rakefile

@@ -4,4 +4,4 @@
 
 require File.expand_path('../config/application', __FILE__)
 
-Adalandlily::Application.load_tasks
+Jeffreyandanna::Application.load_tasks