Super story upgrade!
Super-destroy merge conflicts!

Hopefully.
Actually fix merge conflicts
Merge pull request #3 from remixz/master

Super story upgrade!