added taking classes code
added field for uploading taken classes
resolved merge conflicts