standardized user class definition
Merge branch 'master' of github.com:omahacodeschool/twitter-diversity-report

Conflicts:
	app/models/user.rb