Multiple changes

Changed Number() to parseInt(). Changed the || operator to &&. Added
the next grade range calculation.