Merge branch 'master' of github.com:Xarxa6/hackathon

Conflicts:
	README.md