Work In Progress
Merge branch 'dev' of github.com:rasjani/githooks into dev

Conflicts:
	githooks
New stuff
cleanup