Changes
ads
.
Merge branch 'master' of github.com:Ixider/DB3

Conflicts:
	spatter/app/models/user.rb