modified:   cad_cliente.php
	modified:   cad_produto.php
	modified:   cadastro.php
	modified:   conecta_rota.php
	modified:   conecta_rota2.php
	renamed:    conecta_rota.php -> conecta_rota3.php
	modified:   conecta_rota4.php
	modified:   contato.php
	modified:   contato/form.php
	modified:   estrutura.css
	modified:   home.php
	modified:   index.php
	modified:   loga.php
	modified:   login.php
	modified:   menu.php
	modified:   stylecad.css
	modified:   upload/conecta.php
	busca.php
	cad.php
	car_produto.php
	categoria.php
	comum.php
	contato/estrutura.css
	contato/stylecad.css
	imagem/contato.jpg
	img/cupom.png
	img/imprimir.png
	imp_cupom.php
	item_produto.php
	logout.php
	menucss.css
	menulateral.php
	produto.php
	seach.php
	upload.php
	upload/img/0061851e0e0cd792af3aef648bc95d08.png
	upload/img/35a87af07ff9f7c6a0d2627cdfa6a0af.jpg
	upload/img/3aa511a7d8f9db8a3eac3b8f78c962d2.jpg
	upload/img/3dbda689cf4f450e4f0601e1a64e36ff.jpg
	upload/img/3dcb6cc89ccd505165587d54ac59566c.jpg
	upload/img/4b45208b0c224a1632625b62b5545852.png
	upload/img/50e2b8e526eb8766067457f87b155126.jpg
	upload/img/68c55541fcbcc759bb8e989fa4efca48.jpg
	upload/img/8fd2d1ce3c8138d6e22ab2c03fe70fb9.jpg
	upload/img/b264b1ad0aaceeb3ce56b0c51fe509ad.jpg
	upload/img/ba292c40e173acf80031896e72677ec3.jpg
	upload/img/bac36d16c2f1e56e561bbf5f0ab8b039.jpg
	upload/img/c343f22a1053dd66418663ec26c7dd4f.jpg
	upload/img/cab24a93255975ea593454cc0ea49ad0.jpg
	upload/img/d262e828132a1e11c3a63fe8d3a31e82.jpg
	upload/img/f061601ad44f5eefe201b9169ec36ce9.jpg
	upload/img/fe2a6747eab9318f4dc1ae3490b3a129.png
Merge remote-tracking branch 'origin/master'

Conflicts:
	home.php

	modified:   estrutura.css
	busca.php
	cad.php
	car_produto.php
	categoria.php
	comum.php
	contato/estrutura.css
	contato/stylecad.css
	imagem/contato.jpg
	img/cupom.png
	img/imprimir.png
	imp_cupom.php
	item_produto.php
	logout.php
	menucss.css
	menulateral.php
	produto.php
	seach.php
	upload.php
	upload/img/0061851e0e0cd792af3aef648bc95d08.png
	upload/img/35a87af07ff9f7c6a0d2627cdfa6a0af.jpg
	upload/img/3aa511a7d8f9db8a3eac3b8f78c962d2.jpg
	upload/img/3dbda689cf4f450e4f0601e1a64e36ff.jpg
	upload/img/3dcb6cc89ccd505165587d54ac59566c.jpg
	upload/img/4b45208b0c224a1632625b62b5545852.png
	upload/img/50e2b8e526eb8766067457f87b155126.jpg
	upload/img/68c55541fcbcc759bb8e989fa4efca48.jpg
	upload/img/8fd2d1ce3c8138d6e22ab2c03fe70fb9.jpg
	upload/img/b264b1ad0aaceeb3ce56b0c51fe509ad.jpg
	upload/img/ba292c40e173acf80031896e72677ec3.jpg
	upload/img/bac36d16c2f1e56e561bbf5f0ab8b039.jpg
	upload/img/c343f22a1053dd66418663ec26c7dd4f.jpg
	upload/img/cab24a93255975ea593454cc0ea49ad0.jpg
	upload/img/d262e828132a1e11c3a63fe8d3a31e82.jpg
	upload/img/f061601ad44f5eefe201b9169ec36ce9.jpg
	upload/img/fe2a6747eab9318f4dc1ae3490b3a129.png