minor bug fix
On the shoulders of giants I think
merge
first steps in discovery
Merge branch 'master' of https://github.com/namrop/XbmPwn

Conflicts:
	gui.py