added develop branch
change
asdads
asdasdas
good
good
Update test
Merge pull request #2 from Hebime/develop

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

Conflicts:
	test