stuff
Merge branch 'master' of https://github.com/tcclevela/Happy-Tails

Conflicts:
	happy_tails.rb
fixed merge conflicts