v1.0
Merge branch 'master' of https://github.com/mrfawy/reverseproxy

Conflicts:
	cnsl.py