changed line endings back and forth to wash away windows crap
Merge branch 'master' of git://github.com/ullmark/intercept-proxy into ullmark-master