auxiliar
Merge branch 'master' of https://github.com/isel-27074/AVE1314
Merge branch 'master' of https://github.com/isel-27074/AVE1314
update a bombar
Merge branch 'master' of https://github.com/isel-27074/AVE1314

Conflicts:
	SqlMapperBRR/SqlMapperBRR.Tests/UnitTest.cs
	SqlMapperBRR/SqlMapperBRR/Program.cs