read me
Merge branch 'master' of github.com:janastu/restory-template

Conflicts:
	js/story.js
Edited Readme