Added native linux execution line, python was complaining about an ! not being "not", and added vim modeline
Marked proxy.py with the executable bit and changed the line encoding to work under unix
Merge branch 'master' of github.com:Vocosol/pythonProxy

Conflicts:
	proxy.py