Add .DS_store to .gitignore
Merge remote-tracking branch 'origin/test' into HEAD
Merge branch 'test'
Merge branch 'master' of git@github.com:gecko655/earthquake.git
Merge branch 'test'
Merge branch 'master' of git@github.com:gecko655/earthquake.git