provaaaaaaaaa
Merge branch 'Dev' of https://github.com/RubenFu/Projecte_iSensor into Dev

Conflicts:
	README.md
prova didac
no se k pasaaaaa