i'm not sure if this will work
Merge branch 'master' of https://github.com/jsuarezb/TPEDA

Conflicts:
	bin/model/Game.class
	bin/model/minimax/Minimax.class
	src/model/Game.java
	src/model/minimax/Minimax.java