Otro commit

:3
Merge branch 'master' of https://github.com/Nontraxx/ADITGames

Conflicts:
	main - angulo - charselect.py
	media/background_test.png