untracked config/initializers/secret_token.rb
Merge branch 'master' of https://github.com/sevab/mad_bid