Trying to fix merge conflicts
Merge branch 'master' of https://github.com/habitathalton/hfh
Merge branch 'master' of https://github.com/habitathalton/hfh
Added proper DEFAULT value for timestamp columns in insert statements