Window
Merge remote-tracking branch 'origin/master'

Conflicts:
	VesaMoottori/tex.png