Let's keep yours
Merge branch 'master' of https://github.com/RianaFerreira/HappyTails

Conflicts:
	client.rb

Newly merged files