Thingy mad dingy
Merge remote-tracking branch 'origin/master'

Conflicts:
	LeagueSharp/Assemblies/Assemblies.csproj
	LeagueSharp/Assemblies/obj/Debug/Assemblies.csproj.FileListAbsolute.txt

	LeagueSharp/Assemblies/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	LeagueSharp/LeagueSharp.v12.suo
Merge branch 'master' of https://github.com/iJavai/LeagueSharp

Conflicts: