changing markup, adding css
Merge branch 'master' of git@github.com:openclipart/openclipart.git

Conflicts:
	templates/home-page-content.template