I decide that I'm fed up with this and decide I need a vacation. I decide
to use my awesome Phoenix powers and transport myself to Hawaii.
Merge branch 'master' of github.com:ossp/Git-Branchy-Story-Exercise-01 into Jean_Grey_Story

Conflicts:
	AxiomaticOnomatopoeia/Jean_Grey.md
I go to Hawaii.
Merge branch 'Jean_Grey_Story'
Merge branch 'master' of github.com:ossp/Git-Branchy-Story-Exercise-01