upload
Merge branch 'master' of https://github.com/adielfernandez/Spacetime-Explorer

Conflicts:

Spacetime_Explorer_v6_fragments/bin/Spacetime_Explorer_v6_fragmentsDebug
.app/Contents/MacOS/Spacetime_Explorer_v6_fragmentsDebug