-a
Merge branch 'master' of https://github.com/albert33/projecte-inicial

Conflicts:
	Pedra paper tisores.js~
-a