Change to x to 1:60 :baby_chick:
Merge remote-tracking branch 'their/master'

Conflicts:
	stats.R