Merge pull request #14 from HR-Data-Geyser/develop

Merge develop into master
smooths controls by adding leap controller and conditional
adds yaxis limits
Merge branch 'develop' of https://github.com/HR-Data-Geyser/Data-Geyser into feature/ADJUSTLEAP
adds two/one finger functionality
new globe
Merge branch 'develop' of github.com:HR-Data-Geyser/Data-Geyser into feature/new-globe
swap in new globe
save to develop, work on new globe
Merge branch 'feature/ADJUSTLEAP' into develop
fixes merge conflict
fixes merge conflict
adds basic leap controls, orbitcontrols not working
Merge branch 'feature/Addleap' into develop
Merge pull request #34 from biversen21/newglobe

adds leap motion controls, needs fixing
fixes missing branch
Merge pull request #35 from biversen21/newglobe

fixes missing branch
geo revisions
Merge branch 'feature/new-globe' of github.com:HR-Data-Geyser/Data-Geyser into feature/new-globe

Conflicts:
	client/js/Globe.js
globe texture fix