Merge
Merge branch 'master' of github.com:vitaminmoo/cgminer2rrd

Conflicts:
	clocks.R
Merge branch 'master' of github.com:vitaminmoo/cgminer2rrd

Conflicts:
	clocks.R