dd
Merge branch 'master' of https://github.com/Foxarya/stickyLudum26

Conflicts:
	js/mainJuego.js