commit to merge.
Merge branch 'master' of https://github.com/codingbycoding/codingbycoding

Conflicts:
	python/pytest.py

commit to resolve conflits
regex socket.