gitignore
merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	FrbaCommerce/Program.cs
	FrbaCommerce/bin/Release/FrbaCommerce.exe
	FrbaCommerce/bin/Release/FrbaCommerce.pdb
	FrbaCommerce/obj/Release/FrbaCommerce.exe
	FrbaCommerce/obj/Release/FrbaCommerce.pdb