added hwrk shit
Merge branch 'devjg'

merged with devjg