Integrate read file + calculate karma
Merge branch 'master' of https://github.com/bertex/inLabDojo.git

Conflicts:
	xarxa/pom.xml
	xarxa/src/main/java/lin/ManageData.java
	xarxa/src/main/java/lin/Programmer.java
No se que faig i no posare res concret com a comentari fins que no ho
sapiga
Merge branch 'master' of https://github.com/bertex/inLabDojo.git
Segueixo sense saber-ho.