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