Merge Intervals
Merge branch 'master' of https://github.com/ted7726/py

Conflicts:
	test1.py