Reverting to previous commit
Revert "Reverting to previous commit"

This reverts commit 0827a77010567144d1e22c441d70e6d763cb30fd.
Merge branch 'master' of https://github.com/TellATale/TellATale