john
Merge branch 'master' of https://github.com/davidisOrion/GlGlobe
john1

Signed-off-by: John Hardman <jmhardman@gmail.com>