added player, not functioning yet
Merge branch 'master' of https://github.com/jdoda/afteryou

Conflicts:
	run.py