Gitti on Parasta
Merge remote-tracking branch 'origin/master'

Conflicts:
	VesaMoottori/VesaMoottori/Main.cpp
Merge branch 'master' of https://github.com/Glowny/VesaMoottori