Merge branch 'base'
[ghostsoverboard] / meri.png
2011-05-12 Heli HyvättinenCollision detection works