Made changes to stories and brainstorm
Merge branch 'master' of https://github.com/mhweaver/cs471-nmm.git

Conflicts:
	Brainstorm
Merge branch 'master' of https://github.com/mhweaver/cs471-nmm.git

Conflicts:
	Brainstorm