Merge branch 'manny'
Merge branch 'manny'
gonna mer
Merge branch 'manny'

Conflicts:
	README.md
Merge branch 'manny'
Merge pull request #2 from captaincactuz/manny

Manny
d
Merge branch 'master' of https://github.com/captaincactuz/wifiGOD
Merge branch 'manny'

Conflicts:
	branches/manny/wifiGOD/Library/ScriptAssemblies/Assembly-CSharp.dll
	branches/manny/wifiGOD/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	wifiGOD/Library/assetDatabase3
	wifiGOD/Library/guidmapper
	wifiGOD/Library/metadata/89/89016954867ec4bf59d7ef173fb71026
	wifiGOD/wifiGOD-csharp.sln
	wifiGOD/wifiGOD.sln
k
l
Merge branch 'master' into manny