plop
Merge branch 'master' of https://github.com/cunchem/gtk-wifiscanner

Conflicts:
	wifi_scanner_engine.rb