no message
Merge branch 'collision'
Merge branch 'master' of https://github.com/vikpek/BerlinJam