testing hooks
Merge branch 'master' of https://github.com/JasonProkop/cmpt370