Update gemfile and add User model.
Merge branch 'master' of https://github.com/kwonsjay/textroulette

Conflicts:
	app/models/user.rb
Fixed user model file.