stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	trans.py
stuff
Merge pull request #1 from ror6ax/test

Test