Clean up BuildingHeights.cs and added comments
Merge branch 'master' of https://github.com/cindyl92/EverythingIsAwesome

Conflicts:
CodeCity/Assets/Scripts/JSONParser.cs
Fixed conflict