modified: Gemfile.lock
Merge branch 'ThreeJS' of https://github.com/tufts-LPC/Trails-Forward-server into ThreeJS
only one building per tile, added apartments to back end, mark tile work, conservationist
tile marker changes
modified conservationist
some conservationist changes
changed tile marker code to ignore valid turn field, so they last forever
lumbermill test fixes