Carl-bildt successfully loaded
Merge remote-tracking branch 'origin/master'

Conflicts:
	Cheese Leather 2D/Debug/vc120.idb
	Cheese Leather 2D/World.cpp