not sure why I had a conflict for stick's yaml, but it seems happy now
not sure why I had a conflict for stick's yaml, but it seems happy now

ry60003333/hfoss,liam-middlebrook/hfoss,Petroochio/hfoss,theheckle/hfoss,deejoe/hfoss,liam-middlebrook/hfoss,deejoe/hfoss,Petroochio/hfoss,theheckle/hfoss,ry60003333/hfoss