commit prior to changing branches
Genericized Building and added MyBuilding.  Partially oopified development.py
Merge my_building branch