Closes issue #2
Merge branch 'master' into natsumi

Conflicts:
	almost halloween.txt
Merge pull request #4 from MORTALfish/natsumi

Made an edit and closes issue #2