div style padding
Merge branch 'iss53'

Conflicts:
	css/style.css