border on images in index view
Merge branch '89_rename_to_german'

Conflicts:
	app/views/receipts/index.html.erb