oh god, I do not know how to git
Merge branch 'master' of https://github.com/isislab/Shellcode

Conflicts:
	isis/isis.py