error o k
Merge branch 'master' of https://github.com/marti07/JUnitProject.git

Conflicts:
	CheckingJUnit/src/main/java/edu/eetac/upc/dxat/mgasull/CheckingJUnit/App.java