Update test
Merge pull request #1 from Hebime/master

Update test
Merge branch 'master' of github.com:MadeMediaCorp/testhook

Conflicts:
	test
Merge pull request #4 from MadeMediaCorp/master

updating develop with master