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