add images
Merge remote-tracking branch 'origin/master'

Conflicts:
	html/css/sprite.css
	html/img/icons.png
	html/main.html
add images