Fix rspec and rubocop
Merge branch 'master' into null-object
Remove duplicate specs
Fix variable naming within specs: frame -> time_frame
Merge branch 'master' into null-object

Conflicts:
	spec/time_frame_spec.rb
Fix rubocop issues