Moved some images from hard-coding to file
conflict resolve
more conflict resolve

Conflicts:
	src/world.cpp