resources
Merge branch 'master' of https://github.com/Lunarsong/NakedAcorn

Conflicts:
	Platformer/Content/Content.contentproj
	Platformer/Platformer/Platformer (Windows).csproj.Debug.cachefile