Wesley 23052014
Merge branch 'master' of https://github.com/PatetasSenai/ProjetoTCC

Conflicts:
	.gitignore

	WindowsFormsApplication1/obj/Debug/Restaurante.csproj.GenerateResource.Cache