Text anno box design
Merge branch 'master' of github.com:janastu/restory-template

Conflicts:
	js/story.js
	narrative-theme1.html
	narrative-theme2.html
Merge branch 'master' of github.com:janastu/restory-template

Conflicts:
	js/story.js