After create user
Merge branch 'master' of https://github.com/igatto/ExpenseManager

Conflicts:
	app/models/user.rb
	config/database.yml