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
merge master
Merge pull request #55 from rcatlin/feature/bell-upstairs

[Active Shooter] Move Prof Bell upstairs