Rubykuby/containing — pull request #88 by jeroen940 (2014-12-15 21:46:25+00:00)
Title: Train and lorry cranes can now put a container on the lorry/train

Fixed mergeconflicts.