Testing collision
Merge branch 'master' of https://github.com/Fromethius/the-nut-job.git
My end
Merge branch 'master' of https://github.com/Fromethius/the-nut-job.git