picture class done
picture class fixed
merging picture