being silly
Merge branch 'master' of https://github.com/Fone337/cwards

Conflicts:
	text.txt