ratkotaan ongelmaa
Merge branch 'master' of https://github.com/LaBSo/VJP-peli

Conflicts:
	canvas.js