Shirley, Part 3

Shirley continued to fire her machine guns into the air, while her assistant zoomed through the narrow streets of Troy. It was a good day to be alive.
Merge branch 'Shirleybranch'

Conflicts:
	Toxic Sushi/Shirley.md
Merge branch 'master' of https://github.com/ossp/Git-Branchy-Story-Exercise-01
Merge branch 'master' of https://github.com/ossp/Git-Branchy-Story-Exercise-01