standard error removed
Merge branch 'master' of github.com:joh641/calteach
Merge branch 'master' of github.com:joh641/calteach
overlap bug fix
Merge pull request #181 from joh641/overlap-fix

Overlap fix