updated but forgot I had already updated...
Merge remote-tracking branch 'origin/master' into develop

Conflicts:
	lib/GenSheet.rb
	spec/ods_xls_spec.rb
	spec/spec_helper.rb
	spec/xls_xls_spec.rb
wip
fixed syntax error in specs
much cleaner
updated gem version