Well, it's doing something.
Merge branch 'master' of github.com:mythern/shiny-octo-shame into kradagswter
Handled a particular error.
Merge branch 'master' of github.com:mythern/shiny-octo-shame into kradagswter
I am sorry
fixed the israeli-palestinian conflict
Merge branch 'kradagswter'