another commit
Merge pull request #1 from midori-no-risu/midori

another commit
changed file
Merge branch 'master' of github.com:midori-no-risu/GeekHubTest
Merge branch 'master' into add-make-happy-method

Conflicts:
	TestClass.php