para comm
Merge branch 'master' of https://github.com/Foxarya/stickyLudum26
Merge branch 'master' of https://github.com/Foxarya/stickyLudum26
Merge branch 'master' of https://github.com/Foxarya/stickyLudum26
ffff
Merge branch 'master' of https://github.com/Foxarya/stickyLudum26
ss
Merge branch 'master' of https://github.com/Foxarya/stickyLudum26

Conflicts:
	js/mainJuego.js