updated rockspec
Merge branch 'master' of github.com:ldrumm/chronos

Conflicts:
	chronos-0.1-0.rockspec
fix merge issue
update rockspec