Merge pull request #6 from tmatthews0020/master

ftest
my changes
Merge branch 'master' of https://github.com/m4ttclendenen/PainFreeVoip

todds changes
Merge pull request #5 from m4ttclendenen/master

testing git