updating branch
Merge branch 'master' of github.com:Gloryofthe80s/Team_Project into jen_branch
small styling fixes
one typo
Merge pull request #16 from Gloryofthe80s/jen_branch

Jen branch