yritän synkata omia tiedostoja githubin kaa
Merge branch 'master' of https://github.com/UllaSainio/mensawww

Conflicts:
	images/ical-small.png
	images/qr-small.png