what is this stuff?
Merge branch 'master' of https://github.com/BenVanCitters/dBFest2013

Conflicts:
	Library/assetDatabase3
Adding skeleton regions to main scene