Added MakeHappy method
Merge branch 'master' into add-make-happy-method

Conflicts:
	TestClass.php
Merge pull request #2 from spolischook/add-make-happy-method

Added MakeHappy method