Finished implementing all marbles and continued progress on the lava level.
Merge branch 'master' of https://github.com/zebbedy/jcc2d