gitignore
gitignore
Db
Merge branch 'master' of https://github.com/GustavoAyalaLuiz/Invion

Conflicts:
	Invion.Data/Classes/DbEntityBase.cs
	Invion.Data/bin/Debug/Invion.Data.dll
	Invion.Data/bin/Debug/Invion.Data.pdb
	Invion.Data/obj/Debug/Invion.Data.dll
	Invion.Data/obj/Debug/Invion.Data.pdb
	Invion.Negocio/bin/Debug/Invion.Data.dll
	Invion.Negocio/bin/Debug/Invion.Data.pdb
	Invion.Negocio/bin/Debug/Invion.Negocio.dll
	Invion.Negocio/bin/Debug/Invion.Negocio.pdb
	Invion.Negocio/obj/Debug/Invion.Negocio.dll
	Invion.Negocio/obj/Debug/Invion.Negocio.pdb
	Invion.Negocio/obj/Debug/ResolveAssemblyReference.cache
	Invion.suo
	Invion/bin/Invion.Data.dll
	Invion/bin/Invion.Data.pdb
	Invion/bin/Invion.Negocio.dll
	Invion/bin/Invion.Negocio.pdb
	Invion/bin/Invion.dll
	Invion/bin/Invion.pdb
	Invion/obj/Debug/Invion.dll
	Invion/obj/Debug/Invion.pdb
	Invion/obj/Debug/ResolveAssemblyReference.cache
Ajustes
cdproj
Merge branch 'master' of https://github.com/GustavoAyalaLuiz/Invion

Conflicts:
	Invion.Data/Classes/DbCiaAerea.cs
	Invion.Data/Classes/DbEntityBase.cs
	Invion.Data/Classes/DbInvion.cs
	Invion.Data/Classes/DbTipoViagem.cs
	Invion.Data/bin/Debug/Invion.Data.dll
	Invion.Data/bin/Debug/Invion.Data.pdb
	Invion.Data/obj/Debug/Invion.Data.dll
	Invion.Data/obj/Debug/Invion.Data.pdb
	Invion.Data/obj/Debug/ResolveAssemblyReference.cache
	Invion.Negocio/bin/Debug/Invion.Data.dll
	Invion.Negocio/bin/Debug/Invion.Data.pdb
	Invion.Negocio/bin/Debug/Invion.Negocio.dll
	Invion.Negocio/bin/Debug/Invion.Negocio.pdb
	Invion.Negocio/obj/Debug/Invion.Negocio.dll
	Invion.Negocio/obj/Debug/Invion.Negocio.pdb
	Invion.Negocio/obj/Debug/ResolveAssemblyReference.cache
	Invion.suo
	Invion/Invion.csproj
	Invion/bin/Invion.Data.dll
	Invion/bin/Invion.Data.pdb
	Invion/bin/Invion.Negocio.dll
	Invion/bin/Invion.Negocio.pdb
	Invion/bin/Invion.dll
	Invion/bin/Invion.pdb
	Invion/obj/Debug/Invion.dll
	Invion/obj/Debug/Invion.pdb
	Invion/obj/Debug/ResolveAssemblyReference.cache