Merge branch 'master' of https://github.com/bikebike/BikeBike

Conflicts: Gemfile Gemfile.lock
2014-04-05 19:27:05 -07:00
parent 230295790b b0c0e029fd
commit abaf5b55a4
91 changed files with 1409 additions and 103 deletions
@@ -1,8 +1,8 @@
 require 'spec_helper'

 describe 'Home' do
-  it "has Hello World in title" do
-    visit root_path
-    expect(page).to have_title I18n.t('hello')
-  end
+	#it "has Hello World in title" do
+	#	visit root_path
+	#	expect(page).to have_title I18n.t('hello')
+	#end
 end