Merge branch 'master' of github.com:rcatlin/Emergency-Response into first-hiding-people-adds
added images
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