merge master, conflicts
who's counting
fixed merge conflicts
Merge branch 'master' of github.com:rcatlin/Emergency-Response into south-library-office-events
final changes to SW library events
Merge pull request #118 from rcatlin/south-library-office-events

South library office events