add img and font
add img conflict
Merge pull request #1 from paradox-develop/add_img

Add img