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
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.
merge
merge
submodule update
Merge pull request #75 from rcatlin/second-hiding-people-adds

Second hiding people adds