Laser beams not just for sharks
Merge remote-tracking branch 'upstream/master' into patch-3

Conflicts:
	story.md
Merge pull request #27 from missbassethorn/patch-3

Laser beams not just for sharks