Merge branch 'storyarccore'
Updated for this project
Merge pull request #1 from ashleybot/master

Master