changed return error logic
Merge branch 'master' of https://github.com/heierj/461project1