These are test changes
Merge branch 'master' of github.com:rcatlin/Emergency-Response into johns-misc-items-addition
I added some characters(props) and conversations
Feb 6th, wed meeting
Merge pull request #27 from rcatlin/johns-misc-items-addition

Johns misc items addition