some thoughts in comments
Merge branch 'master' into comment-questions
small readme change
python DEMANDS spaces not tabs!!!
STYLE: python DEMANDS spaces not tabs!!!
STYLE changes, max width in now 80, ex licence, etc
small change "i dropped a space by mistake"`
Merge branch 'master' of github.com:GrayHatter/WiFiz

Conflicts:
	main.py

I dont know what happend but I just discarded the new code from origin master
if you know what went sideways email me
renamed some vars, now the script cleans up after itself
catches ctrl-c now... sorta... SEE NOTES \/

This took me WAY longer then it should have. wx trys to handle ctrl-c for us,
but we really don't want that, because It cant do everything for us. I'm going
to have to dig into the wx code to find out how it interacts with sigint, needs
gui interaction to activate the sigint call
README
code maintence
Merge branch 'documentation'
Merge branch 'develoment'
Merge from upstream

Final commit for the night.

Inital commit for auto-connection with preferred networks upon scan. Some bugs
with it, where the first time the app opens, it won't show the visible
networks, but WILL connect to preferred network. Second time it will scan fine.

Conflicts:
	main.py
Merge remote-tracking branch 'upstream/master'

Conflicts:
	main.py
	readme.mediawiki
Merge remote-tracking branch 'upstream/master'

Conflicts:
	main.py
Merge pull request #3 from GrayHatter/master

merged changes from master with a few developments on top of that