This is starting footprint
Merge branch 'master' of https://github.com/Putnameshere/EarthStation

Conflicts:
	services/threejs.js