Traps finished.
Merge branch 'master' of https://github.com/guerre50/ggjtest