changes
Merge branch 'master' of github.com:gdomingu/orbitalexpress
Merge branch 'master' of github.com:gdomingu/orbitalexpress
adding some stuff to map page and worked on errors some more
Merge branch 'master' of github.com:gdomingu/orbitalexpress
Merge branch 'mapstuff'