Chapter 3
Merge branch 'master' of https://github.com/blindnas/wack

Conflicts:
	story.txt
Merge pull request #5 from zfields/master

Chapter 3