User#peers spec
Merge branch 'master' of https://github.com/RingBase/ringbase

Conflicts:
	app/models/user.rb