add image padding 2px
add image padding 0px
Merge branch 'img' of https://github.com/imagic5004/files into img

Conflicts:
	css/style.css