added grandma
Merge remote-tracking branch 'origin/master'

Conflicts:
	story.txt
Red riding hood wears red!