modified hello.txt
added hellogoodbye.txt
conflict resolved
Merge branch 'dev'
sampling 1M points based on fpar masked grids code is added.
merged.