httpexample.py updated
line ending conflict repaired