Amy's update
Amys update
Merge branch 'master' into nadias-branch

Conflicts:
	story.txt