remove ../ from app
Merge branch 'MacEdits3' into gh-pages
Merge branch 'gh-pages'