Marker hack
Merge branch 'master' of https://github.com/DLu/nasa_web