update
update

Conflicts:
	auto-install.sh
update