temp
Merge remote-tracking branch 'origin/master'

Conflicts:
	trojan_horse.py
Merge branch 'master' of https://github.com/nassan/trojan