merged diplom

first 25 pages