constrols
Merge branch 'master' of github.com:ozroc/lunar_taxi

Conflicts:
	main.py
Some tests...