resetPlayer is also a thing
resetPlayer is also a thing (trying again)
Merge origin/master

Conflicts:
	src/database.txt