Testing git... again
Resolved license conflict
Merge branch 'master' of git://github.com/amyzou/RubeWorks