padding image changes to 32px
Merge branch 'img'

Conflicts:
	css/style.css