adding new screen shots
commit merge conflicts