Revised Code
Merge branch 'master' of https://github.com/neutron7/Rubric