some
.

.
Merge branch 'master' of https://github.com/DefGh/RaspTank

Conflicts:
	control_left.php