texture progress
Merge commit 'c5f8e073924d0878a120118e67a6b46e86919175' into NEWMASTER

"zeke is listening to cyndi lauper"

Conflicts:
	Assets/Prefab/Musical Creature D.prefab
	Assets/Prefab/Musical Creature E.prefab
	Assets/Scenes/Stage.unity
	Fadar.userprefs
	Library/InspectorExpandedItems.asset
most textures implemented
musical node changes -- added textures and stopped loop
i don't know what i'm committing (meta files it won't let me do anything with??)
Merge branch 'master' of https://github.com/zeroarcanum/fadar

Conflicts:
	Assets/Scripts/MusicalTimedTile.cs.meta
	Assets/Scripts/SoundTimingController.cs.meta
Merge branch 'master' of https://github.com/zeroarcanum/fadar
Merge branch 'NEWMASTER'

Conflicts:
	Assembly-UnityScript-Editor-vs.unityproj
	Assembly-UnityScript-Editor.unityproj
	Assembly-UnityScript-firstpass-vs.unityproj
	Assembly-UnityScript-firstpass.unityproj
	Assets/Prefab/MusicalTimedTile A.prefab
	Assets/Prefab/MusicalTimedTile C.prefab
	Assets/Scenes/Stage.unity
	Assets/Textures/Tiles/tile0.png.meta
	Assets/Textures/Tiles/tile1.png.meta
	Assets/Textures/Tiles/tile2.png.meta
	Assets/Textures/Tiles/tile3.png.meta
	Assets/Textures/Tiles/tile4.png.meta
	Assets/Textures/Tiles/tile5.png.meta
	Assets/Textures/Tiles/tile6.png.meta
	Assets/Textures/Tiles/tile7.png.meta
	Assets/Textures/Tiles/tile8.png.meta
	Assets/Textures/Tiles/tile9.png.meta
	Fadar.userprefs
	Library/InspectorExpandedItems.asset
applied world controller prefab changes
Merge branch 'NEWMASTER'

Conflicts:
	Assets/Prefab/WorldController.prefab
merged stuff I guess