Added some image markers for people hiding
Merge branch 'master' of github.com:rcatlin/Emergency-Response into first-hiding-people-adds
added images
Merge branch 'master' into first-hiding-people-adds
Merge branch 'master' of github.com:rcatlin/Emergency-Response into first-hiding-people-adds

Conflicts:
	src/web/img
Merge branch 'first-hiding-people-adds' of github.com:rcatlin/Emergency-Response into first-hiding-people-adds
added some school exploration for the A.S. scenario
These are all the changes I made in first-hinding-people-adds. There was some sort of error in the pull request. Also I've added some of the functionality for when the 'shooter is close and the player runs' that was lost when the 2nd floor was added. Finally I also added some new content for when the shooter is far away. This new content is a bit experimental.
Use warp to move player
Add showConversation to events
Add showConversation to events
adjust camera position in R411
Room plaque modeled.
removed science lab content, skips to library
Smokey Hall Preped for Merge
merge
All room plaques for level 1 added. Included /textures folder.
new renders for R411
Updating submodule
merge