more styling
Merge branch 'master' into presentsocket
Merge pull request #36 from KyleW/presentsocket

More Styling