On branch master
Changes not staged for commit:
	modified:   eliza/Chatbot/Eliza.pm
no changes added to commit (use "git add" and/or "git commit -a")

Conflicts:
	player.py

Conflicts:
	player.py