hacky fix
Merge branch 'master' of /Users/otm/.rbenv/versions/1.9.3-p194/lib/ruby/gems/1.9.1/cache/bundler/git/hallo_rails-bcc5bf1beadbb6800dc3f73e3428fe37e708a43d
hacky fix