I did, .. something.
Merge branch 'master' of github.com:XenGi/FlyFi

Conflicts:
	SettingsWindow.py