finish 3
images
Merge remote-tracking branch 'origin/master'

Conflicts:
	swisscoin/index.html
images, fonts, changes