add unit tests to User spec
Merge branch 'master' of github.com:digitxp/yagtrackr

Conflicts:
	models/user.rb