Further implementation of Theme object model
Further implementation of Theme object model
Merge branch 'theme_object_model' of github.com:weshatheleopard/rubyXL into theme_object_model

Conflicts:
	lib/rubyXL/objects/simple_types.rb
Further implementation of Theme object model
Further implementation of Theme OOXML object model
Further implementation of Theme object
Merge branch 'master' of github.com:weshatheleopard/rubyXL into theme_object_model
More Theme object model additions
Further implementation of Theme
Merge branch 'master' of github.com:weshatheleopard/rubyXL into theme_object_model
Further implementation of Theme OOXML
Merge branch 'master' of github.com:weshatheleopard/rubyXL into theme_object_model
Further inplementation of Theme object model
Merge branch 'master' of github.com:weshatheleopard/rubyXL into theme_object_model

Conflicts:
	Gemfile.lock
Finalizing the Theme object model
Merge pull request #101 from weshatheleopard/theme_object_model

Theme object model
Version bump to 2.5.0
Version bump; regenerated rdocs.
Merge branch 'master' of github.com:weshatheleopard/rubyXL into comment_support

Conflicts:
	lib/rubyXL/objects/theme.rb
	lib/rubyXL/parser.rb
Merge branch 'comment_support' of github.com:weshatheleopard/rubyXL into comment_support