Added getrusage times to CU file, and fix 5-6 impl.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main.cxx