text files
Merge branch 'master' of https://github.com/zoraofwater/330-DGK

Conflicts:
	output.txt
	subscribe.txt