add pics
fix conflict

Conflicts:
	README.md