fixed include guards on barrier and made header for locks
Merge branch 'master' of https://github.com/mgalonsky/hmc_networks_6