Vilin muutoksia
Merge branch 'vilin'

Conflicts:
	screen.html
Add bg-image (vilin)
Merge branch 'vilin'