test.py
Merge branch 'master' of github.com:NoMoKeTo/transit

Conflicts:
	test.py