No changes
Merge branch 'master' of https://github.com/Team-Seath-The-Scaleless/Pocket-Monsters-Minified

Conflicts:
	PocketMonsters/Library/AnnotationManager
personal db issues
adding food items
adding some code
Merge branch 'master' of https://github.com/Team-Seath-The-Scaleless/Pocket-Monsters-Minified

Conflicts:
	PocketMonsters/Assembly-CSharp.csproj
	PocketMonsters/Assets/PokemonGameDiagram.cd
	PocketMonsters/Assets/Scripts/Abilities/Aftershock.cs
	PocketMonsters/Assets/Scripts/Abilities/Armageddon.cs
	PocketMonsters/Assets/Scripts/Abilities/Balefrost.cs
	PocketMonsters/Assets/Scripts/Abilities/Cataclysm.cs
	PocketMonsters/Assets/Scripts/Abilities/Eruption.cs
	PocketMonsters/Assets/Scripts/Abilities/Firebreath.cs
	PocketMonsters/Assets/Scripts/Abilities/Flamestrike.cs
	PocketMonsters/Assets/Scripts/Abilities/Frostbolt.cs
	PocketMonsters/Assets/Scripts/Abilities/Glacialstorm.cs
	PocketMonsters/Assets/Scripts/Abilities/NormalAttack.cs
	PocketMonsters/Assets/Scripts/Abilities/Recharge.cs
	PocketMonsters/Assets/Scripts/Abilities/Supernova.cs
	PocketMonsters/Assets/Scripts/Abilities/ThunderShock.cs
	PocketMonsters/Assets/Scripts/Creatures/EnemyNpc.cs
	PocketMonsters/Assets/Scripts/Environment/Battlefield.cs
	PocketMonsters/PocketMonsters-csharp.v12.suo
	PocketMonsters/PocketMonsters.v12.suo
Merge branch 'master' of https://github.com/Team-Seath-The-Scaleless/Pocket-Monsters-Minified