first proper commit
first merge
Merge branch 'master' of https://github.com/nealealex/HighPerformanceScientificComputing