Merge remote-tracking branch 'refs/remotes/origin/master' into gh-pages
corrected relative path to file
trying to fix relative path
didn't upload the most recent version. Only ajax JSON works right.
uploading most recent version. Only ajax json works
Merge remote-tracking branch 'refs/remotes/origin/gh-pages'