fix
Merge branch 'master' of https://github.com/aalabarce/gdd-tp2014-1c

Conflicts:
	src/FrbaCommerce/Comprar-Ofertar/Comprar.cs