collision block added
collision
Merge branch 'master' of https://github.com/Valtis/Peliprojekti-2013
collision block without dummy frame
fixed collision