we don't use this anymore, but testing...
Beginning server communication
Merge remote-tracking branch 'origin/master'