User model and tests
Merge branch 'master' of https://github.com/bobolinks-2014/mano-a-many

Conflicts:
	Gemfile
	app/models/squaring_event.rb
	app/models/transaction.rb