block update
scroll
Merge remote-tracking branch 'origin/master'
block update
Merge branch 'master' of https://github.com/tjokimie/dodo
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/fi/dodo/object/Landscape.java
	src/fi/dodo/object/LandscapeObject.java
Merge branch 'master' of https://github.com/tjokimie/dodo
bugi korjaus ja pomppunopeus x2