made final cpu test for intel
fixing merge
Merge branch 'master' of github.com:parahunter/HPC