udpates
updated merge conflicts
updated all the errors
Merge pull request #10 from CTFigueroa/master

Updated all errors