collisions
frontend development first step
Merge branch 'master' of github.com:kubov/octopus