Makieta lokacji 1
Merge branch 'master' into v0.2.0
- Futile attempt at merging and fixing
- Someone fix this