Complete Beta
Complete Beta attempt 2

	new file:   modules/Assets/animations/characters/Accessory/AccessoryGlassesEast.asset.taml
	new file:   modules/Assets/animations/characters/Accessory/AccessoryGlassesNorth.asset.taml
	new file:   modules/Assets/animations/characters/Accessory/AccessoryGlassesSouth.asset.taml
	new file:   modules/Assets/animations/characters/Accessory/AccessoryGlassesWest.asset.taml
	new file:   modules/Assets/animations/characters/Accessory/AccessoryScarfEast.asset.taml
	new file:   modules/Assets/animations/characters/Accessory/AccessoryScarfNorth.asset.taml
	new file:   modules/Assets/animations/characters/Accessory/AccessoryScarfSouth.asset.taml
	new file:   modules/Assets/animations/characters/Accessory/AccessoryScarfWest.asset.taml
	new file:   modules/Assets/animations/characters/Emotion/Embarrassed/HeadMalePakehaEmbarrassedEast.asset.taml
	new file:   modules/Assets/animations/characters/Emotion/Embarrassed/HeadMalePakehaEmbarrassedNorth.asset.taml
	new file:   modules/Assets/animations/characters/Emotion/Embarrassed/HeadMalePakehaEmbarrassedSouth.asset.taml
	new file:   modules/Assets/animations/characters/Emotion/Embarrassed/HeadMalePakehaEmbarrassedWest.asset.taml
	new file:   modules/Assets/animations/characters/Hair/HairBlondeAndroEast.asset.taml
	new file:   modules/Assets/animations/characters/Hair/HairBlondeAndroNorth.asset.taml
	new file:   modules/Assets/animations/characters/Hair/HairBlondeAndroSouth.asset.taml
	new file:   modules/Assets/animations/characters/Hair/HairBlondeAndroWest.asset.taml
	new file:   modules/Assets/animations/characters/Hair/HairBlondeFemmeEast.asset.taml
	new file:   modules/Assets/animations/characters/Hair/HairBlondeFemmeNorth.asset.taml
	new file:   modules/Assets/animations/characters/Hair/HairBlondeFemmeSouth.asset.taml
	new file:   modules/Assets/animations/characters/Hair/HairBlondeFemmeWest.asset.taml
	new file:   modules/Assets/animations/characters/Hair/HairBlondePunkEast.asset.taml
	new file:   modules/Assets/animations/characters/Hair/HairBlondePunkNorth.asset.taml
	new file:   modules/Assets/animations/characters/Hair/HairBlondePunkSouth.asset.taml
	new file:   modules/Assets/animations/characters/Hair/HairBlondePunkWest.asset.taml
	new file:   modules/Assets/animations/characters/Hair/HairBrownAndroEast.asset.taml
	new file:   modules/Assets/animations/characters/Hair/HairBrownAndroNorth.asset.taml
	new file:   modules/Assets/animations/characters/Hair/HairBrownAndroSouth.asset.taml
	new file:   modules/Assets/animations/characters/Hair/HairBrownAndroWest.asset.taml
	new file:   modules/Assets/animations/characters/Hair/HairBrownFemmeEast.asset.taml
	new file:   modules/Assets/animations/characters/Hair/HairBrownFemmeNorth.asset.taml
	new file:   modules/Assets/animations/characters/Hair/HairBrownFemmeSouth.asset.taml
	new file:   modules/Assets/animations/characters/Hair/HairBrownFemmeWest.asset.taml
	new file:   modules/Assets/animations/characters/Hair/HairBrownPunkEast.asset.taml
	new file:   modules/Assets/animations/characters/Hair/HairBrownPunkNorth.asset.taml
	new file:   modules/Assets/animations/characters/Hair/HairBrownPunkSouth.asset.taml
	new file:   modules/Assets/animations/characters/Hair/HairBrownPunkWest.asset.taml
	new file:   modules/Assets/animations/characters/Hair/HairBrownWavyEast.asset.taml
	new file:   modules/Assets/animations/characters/Hair/HairBrownWavyNorth.asset.taml
	new file:   modules/Assets/animations/characters/Hair/HairBrownWavySouth.asset.taml
	new file:   modules/Assets/animations/characters/Hair/HairBrownWavyWest.asset.taml
	new file:   modules/Assets/animations/characters/Hair/HairGreyAndroEast.asset.taml
	new file:   modules/Assets/animations/characters/Hair/HairGreyAndroNorth.asset.taml
	new file:   modules/Assets/animations/characters/Hair/HairGreyAndroSouth.asset.taml
	new file:   modules/Assets/animations/characters/Hair/HairGreyAndroWest.asset.taml
	new file:   modules/Assets/animations/characters/Hair/HairPurpleAndroEast.asset.taml
	new file:   modules/Assets/animations/characters/Hair/HairPurpleAndroNorth.asset.taml
	new file:   modules/Assets/animations/characters/Hair/HairPurpleAndroSouth.asset.taml
	new file:   modules/Assets/animations/characters/Hair/HairPurpleAndroWest.asset.taml
	new file:   modules/Assets/animations/characters/Hair/HairPurpleFemmeEast.asset.taml
	new file:   modules/Assets/animations/characters/Hair/HairPurpleFemmeNorth.asset.taml
	new file:   modules/Assets/animations/characters/Hair/HairPurpleFemmeSouth.asset.taml
	new file:   modules/Assets/animations/characters/Hair/HairPurpleFemmeWest.asset.taml
	new file:   modules/Assets/animations/characters/Hair/HairPurplePunkEast.asset.taml
	new file:   modules/Assets/animations/characters/Hair/HairPurplePunkNorth.asset.taml
	new file:   modules/Assets/animations/characters/Hair/HairPurplePunkSouth.asset.taml
	new file:   modules/Assets/animations/characters/Hair/HairPurplePunkWest.asset.taml
	new file:   modules/Assets/animations/characters/Hair/HairPurpleWavyEast.asset.taml
	new file:   modules/Assets/animations/characters/Hair/HairPurpleWavyNorth.asset.taml
	new file:   modules/Assets/animations/characters/Hair/HairPurpleWavySouth.asset.taml
	new file:   modules/Assets/animations/characters/Hair/HairPurpleWavyWest.asset.taml
	new file:   modules/Assets/animations/characters/Legs/LegsJeansIdleEast.asset.taml
	new file:   modules/Assets/animations/characters/Legs/LegsJeansIdleNorth.asset.taml
	new file:   modules/Assets/animations/characters/Legs/LegsJeansIdleSouth.asset.taml
	new file:   modules/Assets/animations/characters/Legs/LegsJeansIdleWest.asset.taml
	new file:   modules/Assets/animations/characters/Legs/LegsJeansWalkEast.asset.taml
	new file:   modules/Assets/animations/characters/Legs/LegsJeansWalkNorth.asset.taml
	new file:   modules/Assets/animations/characters/Legs/LegsJeansWalkSouth.asset.taml
	new file:   modules/Assets/animations/characters/Legs/LegsJeansWalkWest.asset.taml
new file:   modules/Assets/animations/characters/Legs/LegsPantsIdleEast.asset.taml
	new file:   modules/Assets/animations/characters/Legs/LegsPantsIdleNorth.asset.taml
	new file:   modules/Assets/animations/characters/Legs/LegsPantsIdleSouth.asset.taml
new file:   modules/Assets/animations/characters/Legs/LegsPantsIdleWest.asset.taml
	new file:   modules/Assets/animations/characters/Legs/LegsPantsWalkEast.asset.taml
	new file:   modules/Assets/animations/characters/Legs/LegsPantsWalkNorth.asset.taml
	new file:   modules/Assets/animations/characters/Legs/LegsPantsWalkSouth.asset.taml
	new file:   modules/Assets/animations/characters/Legs/LegsPantsWalkWest.asset.taml
	new file:   modules/Assets/animations/characters/Legs/LegsShortsIdleEast.asset.taml
	new file:   modules/Assets/animations/characters/Legs/LegsShortsIdleNorth.asset.taml
	new file:   modules/Assets/animations/characters/Legs/LegsShortsIdleSouth.asset.taml
	new file:   modules/Assets/animations/characters/Legs/LegsShortsIdleWest.asset.taml
	new file:   modules/Assets/animations/characters/Legs/LegsShortsWalkEast.asset.taml
	new file:   modules/Assets/animations/characters/Legs/LegsShortsWalkNorth.asset.taml
	new file:   modules/Assets/animations/characters/Legs/LegsShortsWalkSouth.asset.taml
	new file:   modules/Assets/animations/characters/Legs/LegsShortsWalkWest.asset.taml
	new file:   modules/Assets/animations/characters/Legs/LegsSkirtIdleEast.asset.taml
	new file:   modules/Assets/animations/characters/Legs/LegsSkirtIdleNorth.asset.taml
	new file:   modules/Assets/animations/characters/Legs/LegsSkirtIdleSouth.asset.taml
	new file:   modules/Assets/animations/characters/Legs/LegsSkirtIdleWest.asset.taml
	new file:   modules/Assets/animations/characters/Legs/LegsSkirtWalkEast.asset.taml
	new file:   modules/Assets/animations/characters/Legs/LegsSkirtWalkNorth.asset.taml
	new file:   modules/Assets/animations/characters/Legs/LegsSkirtWalkSouth.asset.taml
	new file:   modules/Assets/animations/characters/Legs/LegsSkirtWalkWest.asset.taml
	new file:   modules/Assets/animations/characters/Torso/TorsoHoodieEast.asset.taml
	new file:   modules/Assets/animations/characters/Torso/TorsoHoodieNorth.asset.taml
	new file:   modules/Assets/animations/characters/Torso/TorsoHoodieSouth.asset.taml
	new file:   modules/Assets/animations/characters/Torso/TorsoHoodieWest.asset.taml
	new file:   modules/Assets/animations/characters/Torso/TorsoTShirtEast.asset.taml
	new file:   modules/Assets/animations/characters/Torso/TorsoTShirtFEast.asset.taml
	new file:   modules/Assets/animations/characters/Torso/TorsoTShirtFNorth.asset.taml
	new file:   modules/Assets/animations/characters/Torso/TorsoTShirtFSouth.asset.taml
	new file:   modules/Assets/animations/characters/Torso/TorsoTShirtFWest.asset.taml
	new file:   modules/Assets/animations/characters/Torso/TorsoTShirtNorth.asset.taml
	new file:   modules/Assets/animations/characters/Torso/TorsoTShirtSouth.asset.taml
	new file:   modules/Assets/animations/characters/Torso/TorsoTShirtWest.asset.taml
	new file:   modules/Assets/images/sprites/characters/TorsoEmotion.asset.taml
	new file:   modules/Year8/1/lesson3A/dialogue/increasedHair.cs
	new file:   modules/Year8/1/lesson3A/dialogue/increasedHair.cs.dso
	new file:   modules/Year8/1/lesson3A/dialogue/moody.cs
	new file:   modules/Year8/1/lesson3A/dialogue/moody.cs.dso
	new file:   modules/Year8/1/lesson3A/dialogue/period.cs
	new file:   modules/Year8/1/lesson3A/dialogue/period.cs.dso
	new file:   modules/Year8/1/lesson3A/dialogue/pimples.cs
	new file:   modules/Year8/1/lesson3A/dialogue/pimples.cs.dso
	new file:   modules/Year8/1/lesson3A/dialogue/wetDream.cs
	new file:   modules/Year8/1/lesson3A/dialogue/wetDream.cs.dso
Merge branch 'master' of https://github.com/LucidMage/Beta

Conflicts:
	Beta.torsion.opt
	modules/Main/1/main.cs
	modules/Main/1/main.cs.dso
	modules/Main/1/sprites/characters/character.cs.dso
	modules/Year8/1/lesson2/scenes/gate.cs
	modules/Year8/1/lesson3A/scenes/forest.cs
	modules/Year8/1/lesson3A/scenes/forest.cs.dso

	modified:   Beta.torsion.opt
	modified:   modules/Main/1/main.cs
	modified:   modules/Year8/1/lesson2/scenes/gate.cs
	modified:   modules/Year8/1/lesson3A/scenes/forest.cs