hw and sw
Merge branch 'master' of https://github.com/parahunter/HPC