Fighting monster mash
Merge pull request #6 from connerbrooks/master

Fighting monster mash
Merge branch 'master' of https://github.com/blindnas/wack

Conflicts:
	story.txt