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