setup
Merge branch 'master' of https://github.com/jimmont/earthquake-ready
resolve
Conflicts:
	README.md
cleanup
make this a little more accurate