little change
professor: almost done, a little bug;
logo
merge