Merging
Merge branch 'engine'

Conflicts:
	.classpath
Make it run again
Getters/setters in Tile