first commit in a long time
img file name changed
changed minor conflicts