...
Merge branch 'master' of https://github.com/CheeseSoftware/Cheese-Leather-2D

Conflicts:
	Cheese Leather 2D/Debug/vc120.idb
	Cheese Leather 2D/World.cpp
Merge branch 'master' of https://github.com/CheeseSoftware/Cheese-Leather-2D