Merge branch 'master' into gh-pages
Giza lines
Geo II

new version with better outputting of data sorted in columns by type
Merge branch 'gh-pages'