1
Merge branch 'master' of https://github.com/craus/games-development

Conflicts:
	magic_duel.js