Include change, makefile change for mac compile
Moving code from headers to cpp files
fixed compile errors and addd images
Fixed runtime error and environment variables
Merge branch 'engine' into macVersion

Conflicts:
	.gitignore
	code/engine/render/image.h
Merge branch 'engine' into macVersion

Conflicts:
	.gitignore
Began adding code to create a config file scanner
Finished Config File Parser
Hero and World definitions now come from config file
Image additions, and settings changes
Merge branch 'engine' into macVersion

Conflicts:
	code/engine/world_definition/gameUniverse.h
Cuts pulled from config. Began adding code to pull Pixelation Algo from Config
Finished pulling all items from config file for the Game Worlds, including pix Algos
Added Portal World Definitions.
Convert mac specific code to merge branches
Fixed Errors on the config file upload for Thomas
Work down for the sugar level
Merge branch 'engine' into macVersion

Conflicts:
	code/engine/render/blend.cpp
	code/engine/render/blend.h
	code/engine/world_definition/gameUniverse.cpp
	code/engine/world_definition/gameWorld.cpp
	code/engine/world_definition/gameWorld.h
	code/game.cpp
Added Sprite Pixelation
Update sprite.h