Assimilating the globe directory into our app
Merge branch 'master' into assimilate-globe
Moved files in the globe directory to their proper place
Merge pull request #29 from rjbernaldo/assimilate-globe

Assimilate globe