Test
Merge branch 'master' of https://github.com/edvallie/pyclock

Conflicts:
	README.md