Merge branch '06837f5-modified'

Author	Brian <brian1461748123@gmail.com>
Author date	2016-07-25 16:52:05
Author local date	2016-07-25 09:52:05 -0700
Committer	Brian <brian1461748123@gmail.com>
Committer date	2016-07-25 16:52:05
Committer local date	2016-07-25 09:52:05 -0700
Commit	54981e2098dad118fe30b8ef99622c701651add8
Tree	0cc54024627403493f01f9177c7b97fc24c1c10c
Parent	8e8f7cc302b542bfb1e8963abeab54e3639bed31
Parent	f8bbf0e6a9c021d0af154f88b00e43089c1848b1

Merge branch '06837f5-modified'

# Conflicts:
#	.vs/Pokemon Go Rocket API/v14/.suo
#	PokemonGo/RocketAPI/Window/MainForm.Designer.cs
#	PokemonGo/RocketAPI/Window/MainForm.cs
#	PokemonGo/RocketAPI/Window/PokemonGo.RocketAPI.Window.csproj
#	PokemonGo/RocketAPI/obj/Debug/Pokemon Go Rocket API.dll
#	PokemonGo/RocketAPI/obj/Debug/Pokemon Go Rocket API.pdb

#	PokemonGo/RocketAPI/obj/Debug/PokemonGo.RocketAPI.csprojResolveAssemblyReference.cache

Affected files:
PokemonGo/RocketAPI/Console/PokemonGo.RocketAPI.Console.csproj
PokemonGo/RocketAPI/Window/MainForm.Designer.cs
PokemonGo/RocketAPI/Window/MainForm.cs
PokemonGo/RocketAPI/Window/PokemonGo.RocketAPI.Window.csproj

You may download the files in Public Git.