Not yet working greedy
Merge branch 'master' of https://github.com/guertin/flesh_eating_vegehashtables
Merge branch 'master' of https://github.com/guertin/flesh_eating_vegehashtables
fixing merge issues
fixing merge issues again