Change the design back to an image
Merge branch 'develop'

* develop:
  Change the design back to an image

Conflicts:
	public/css/style.css