week06 update, added js to me app
no actual merge conflicts