Changed everything.

It works. Don't touch :)
Merge remote-tracking branch 'origin/idontevenknow' into idontevenknow

Conflicts:
	main.py