bouncing diamond
Merge branch 'prototype' of ssh://github.com/sconealone/ggj14 into prototype