fix typos and update a few things
fix typos and update
Fixed merge conflict for Tyler's edits
Merge branch 'master' of github.com:JumpstartLab/portfolio