zomg
colision resuleta
Merge branch 'master' of https://github.com/gonzalezf/Tarea2LP

Conflicts:
	Board.java