Fixed source of some error messages

Signed-off-by: James Marsh <james.marsh124@gmail.com>
Merge branch 'master' of https://github.com/evangallo/EECS290FinalProject