fixing typo in readme
Merge branch 'master' of github.com:anilmaurya/bidder
added a check for user entering only numbers greater than 0
Merge pull request #15 from rishijain/master

added a check for user entering only numbers greater than 0
Added rails 4 support
adding twitter authentication
Merge branch 'master' of github.com:anilmaurya/bidder
change application title
removing username validations
adding username as twitter nickname
typo fix
fix the sanity error in rails 4
Merge branch 'master' of github.com:anilmaurya/bidder into rails_4

Conflicts:
	Gemfile.lock
	app/models/user.rb
added different api for pusher
adding 'bson' and 'moped'
user same pusher api for development and production
Updated gems for testing
FIX# Removed the dependency on ruby 2.0.0
Added ruby for sake of heroku
Merge pull request #24 from sivagollapalli/master

Updated gems for testing