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

styling