some changes that I forgot to commit
Merge branch 'master' of https://github.com/carlosfm1989/CMPE264