Main style change, get to look like the final
style
test
Merge branch 'master' of https://github.com/davidisOrion/GlGlobe

Conflicts:
	public/view/scene.html
apply stash
Merge branch 'master' of https://github.com/davidisOrion/GlGlobe