nadias-branch first edit
Amys second update
Merge branch 'master' into nadias-branch

Conflicts:
	story.txt
Merge branch 'nadias-branch' of https://github.com/lbain/RGN-july-2014 into nadias-branch

Conflicts:
	story.txt
Merge branch 'master' into nadias-branch

Conflicts:
	story.txt
Merge pull request #1 from lbain/nadias-branch

Nadias branch