some wifi stuff, so far, so good
Merge remote-tracking branch 'origin/master'