Added shoulda-matchers
Use faker
Committed latest changes