before switching to new branch
Merge branch 'master' of https://github.com/dirkstahlecker/ppat_project
Merge branch 'master' of https://github.com/dirkstahlecker/ppat_project
Merge branch 'master' of https://github.com/dirkstahlecker/ppat_project
Merge branch 'master' of https://github.com/dirkstahlecker/ppat_project
restructuring a ton of stuff
functional rendering
need to populate floorplans
fixed conflicts