Made corrections to navigation code
Merge branch 'master' of https://github.com/charleslockner/eclass into charles
Merge branch 'charles'