add users model
gemfile repair
Merge branch 'master' of https://github.com/hori-1923/bbs

Conflicts:
	Gemfile
	config/initializers/rails_admin.rb