just commit
fix
Merge branch 'master' of https://github.com/ultimaterobotics/vuzlik

Conflicts:
	wp-content/plugins/zno-parser/fix_tables.php