final version of the project
Merge branch 'master' of https://github.com/dbbarcenas/Project1-Web