Merge pull request #1 from jahrodillas/local_jahlex

updated
adding file 2
added new line
<<<<<<< HEAD