Kulkeeko
Merge remote-tracking branch 'origin/master'

Conflicts:
	QuickPayment/testi.txt