Added text and an image
fixed conflict
Merge branch 'elazarski-master'