Fixed some bugs with shapes
Merge branch 'master' of https://github.com/mdziemia/GameOfLife