Merge branch 'master' of https://github.com/AlexYankee/githook

Conflicts:
	.gitignore