i made a comment
Merge remote-tracking branch 'origin/master'

Conflicts:
	hangman.py
Merge branch 'master' of https://github.com/Xenocide007/Python-Projects
Merge branch 'master' of https://github.com/Xenocide007/Python-Projects

Conflicts:
	hangman.py