hackathom

merge conflict fix

Shameless na de deadline push

Translation doesn't work yet :(

Merge branch 'master' of github.com:AVeenstra/hackathom

Fixes the recipe-method for current implementation