Merge pull request #41 from rdincher/master

error handling
# 10
Pretty much functional
Merge pull request #42 from Hartman2/master

Pretty Much Functional
Merge pull request #10 from Coms362/master

Almost Done