Add a Bitdeli badge to README
Merge pull request #7 from bitdeli-chef/master

Add a Bitdeli Badge to README
Update README.md
agregando archivos resources y clases java
Merge branch 'master' of https://github.com/ecabrerar/BarCampSTI2013-Maven
Update README.md
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
Merge pull request #6 from ecabrerar/master

Ejercicio de pruebas unitarias