First commit
Merge https://github.com/Ethcelon/test-code

Conflicts:
	sorten.py