testing
Merge branch 'master' of https://github.com/enochcheung/ordinal

Conflicts:
	Ordinal.py