moved shooter and his triggers upstairs
merged with john's latest changes
pulled the gunshots / alert out of the Bell conversation
need to abort the shooting if you retreat back into the room
Merge branch 'master' into feature/bell-upstairs
removed trailing commas
Squashed earthquake-def
Added computer back in
Extra curly bracket
Removed duplicate conversations
Fixed more convos
Merge pull request #58 from rcatlin/new-earthquake-def

Squashed earthquake-def
merge master
Merge pull request #55 from rcatlin/feature/bell-upstairs

[Active Shooter] Move Prof Bell upstairs
2nd floor includes elevator
added 2nd floor cameras
Enables multiple values to be checked in a check condition
Enables multiple values to be checked in a check condition
Multiple check values on doesNotContain
Incorrectly added a condition statement