(ios)added instructor page which lists courses taught by instructor
fixed merge conflicts