image slicing added
html folder added
extra folder deleted
Merge branch 'develop' into testing

Conflicts:
	8_front end /photoshop/assignment 1/happy_new_year.png
	8_front end /photoshop/assignment 1/happy_new_year.psd
	8_frontend/photoshop/assignment 1/happy_new_year.png
	8_frontend/photoshop/assignment 1/happy_new_year.psd
	photoshop/photoshop1/happy_new_year.png
	photoshop/photoshop1/happy_new_year.psd
File herarchy updated
extrea folder removed