Commit before alex pull
Merge branch 'master' of github.com:asaldivar/wdi_alum_la