git hook
test commit
Merge branch 'hook'
improve commit message
Merge branch 'master' of github.com:jblomo/webarch253