Lis�tty p�ivitysi�
Merge branch 'master' of https://github.com/LaBSo/VJP-peli

Conflicts:
	canvas.js
jarrutukset yms