building manager
Merge branch 'master_2' of https://github.com/nanarchrist/potatolo into MEGAMAAAAN
conflict
fix collisions