This is just a temporary commit to save my changes. I'm not ready to push yet.
Again these are just temp changes. Not quite ready for pull request. Just need to pull from master.
These are the final changes for the fight content in the office at the SW end of the library. There are lots of different ways to die/survive.
These are the triggers and changes needed for the NW office in the library
Merge branch 'master' of github.com:rcatlin/Emergency-Response into library-NWoffice-content
Position and scale new go-kit images
Allow action variables in json definitions
Pack Go-Kit from around the room
Remove apartment_desk def
Position desk items
Action convos don't need awesome names
submodule update
Merge branch 'master' of github.com:rcatlin/Emergency-Response into fix/go-kit
Merge pull request #126 from rcatlin/shooter/cleanup

[Active Shooter] cleanup
Additions to upstairs rooms, emphasis on library
model updates
merge with master branch
submodule. for woodshelf
Merge branch 'master' of github.com:rcatlin/Emergency-Response into fix/go-kit
Added some instructive text to the help modal.