fix shapes positions
Merge branch 'master' of github.com:micnic/Best-Hackaton