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
Image additions, and settings changes
Merge branch 'engine' into macVersion

Conflicts:
	code/engine/world_definition/gameUniverse.h
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
Merge branch 'engine' into macVersion

Conflicts:
	code/engine/render/blend.h
	code/engine/render/font.cpp
	code/engine/render/font.h
	code/engine/render/gfx.h
	code/engine/render/image.cpp
	code/engine/render/image.h
	code/engine/world_definition/enemy.cpp
	code/engine/world_definition/gameUniverse.cpp
	code/engine/world_definition/hero.cpp
FIxes to merge to compile and run
Merge branch 'engine' into macVersion

Conflicts:
	code/engine/world_definition/gameWorld.h
Step One to change engine to mac compatable
Second Step to make engine mac compatable
Make same as macVersion
Merge branch 'macEngine' into macVersion

Conflicts:
	code/engine/graphics/graphicsEngine.h
	code/engine/render/gfx.cpp
	code/makefilemac
Make similar to engine branch