Added new colors which were introduced in Minecraft 13w42a, and extracted
the number of colors to a constant value.
Fixed Pallete and Random generators to use the new colors.
Merge branch 'master' of git://github.com/WolfieMario/ImageToMap-X into WolfieMario-master

Conflicts:
	resources/colors
	src/data_structures.h
	src/generate.c
	src/main.c
Merge branch 'master' of git://github.com/WolfieMario/ImageToMap-X into WolfieMario-master

Conflicts:
	resources/colors
	src/data_structures.h
	src/generate.c
	src/main.c
Merge branch 'WolfieMario-master'