ji
Merge branch 'master' of github.com:SelrahcD/hooktest

Conflicts:
	composer.lock
Merge branch 'master' of github.com:SelrahcD/hooktest

Conflicts:
	composer.lock
Merge branch 'master' of github.com:SelrahcD/hooktest

Conflicts:
	composer.lock
Merge branch 'master' of github.com:SelrahcD/hooktest

Conflicts:
	composer.lock