Don't send emails just yet
Merge branch 'master' of github.com:alephtwo/cs485