Story Screen included

alpha story screen
Merge branch 'master' into Gabe-testing
Merge branch 'Gabe-testing'