upstream changes applied
added category control
added categories
Merge branch 'master' of github.com:tonybaldwin/rubyred

Conflicts:
	README.md
	rubyred.rb

adding categories
fixed something...
Merge pull request #1 from tonybaldwin/master

categories merging...sorry for confusion, amigo