Loads pictures of tiles on board
Merge branch 'master' into mauricio

Conflicts:
	src/models/Game.java
Merge branch 'mauricio'