Merge pull request #13 from rhernandez04/master

Fixed error messages
fixed <<<<<<<<< HEAD weird error