commiting for sync
Merge branch 'master' of https://github.com/Jixxl/Meticlock

Conflicts:
	lib/MetiClock/clitools.rb
MARKED, CORRECTED