derp
Merge https://github.com/lasshi/JollaCodecamp

derp