Allyson's edits
Merge branch 'master' of https://github.com/alboudoures/swc

Conflicts:
	favorite_poem.txt