Merge branch 'sarah'

conflicts from added gems.
Merge branch 'master' of https://github.com/AkermanGreg/happy

diff.
Merge branch 'master' of https://github.com/AkermanGreg/happy

fixing local master