image added for project(i)
merging
after merging
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html
after merging !