added jj
Merge branch 'master' of https://github.com/fhtw/bernegger_hammer_kriegbaum
woooot