updates gitignore
Merge branch 'master' into develop
updates the earthquake manager to fix a pesky bug that happens if no nearest cities can be found
Merge branch 'develop'