Added shoulda gem, created associations