no message
Merge branch 'master' of https://github.com/davidisOrion/GlGlobe
no message
no message
Merge branch 'master' of https://github.com/davidisOrion/GlGlobe

Conflicts:
	public/js/globe.js