Updated the Diabetes Risk Calculator, moved the location of the risk calculators to subdirectories, misc fixes
Removed extreneous .bak files