push my stuff
post branch creation random stuff?
glitched images
Merge branch 'master' of https://github.com/BenVanCitters/dBFest2013

Conflicts:
	Assembly-CSharp.pidb
	Assets/Materials/_skeletondefault.mat
	Assets/Prefabs/Materials/08 - Default.mat
	Assets/Scenes/MainScene.unity
	Library/InspectorExpandedItems.asset
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/09/09a413204bdd15640ab6afa3a9a1124f
	Library/metadata/cc/ccc2ca709b74dfe438c8246285099c44
	ProjectSettings/QualitySettings.asset
Finished up the 'merge'