no message
Merge branch 'master' of https://github.com/gr0nsko/RobotsAliensAndSuperheroes

Conflicts:
	src/js/algoritmo.js