Merge branch 'master' of git@github.com:gecko655/earthquake.git