updated gems
added shoulda gem
added specs for progress and couple behavoir
Merge branch 'master' into feature/users_to_couples

Conflicts:
	Gemfile
	Gemfile.lock
fixed lockfile
fixed bullet bug
added couples
added progress
made factories for couples and progresses
added last pending spec
refactored gemfile
made couples work
made users work
implemented part of the couple behavior
added progress functionality
fixed bug
improved test
fixed deactivation of other couples
improved test
deleted test and moved it to progress