first commit: have a basic client server hookup going
Merge remote-tracking branch 'github_remote/master'

Merging remote github branch into local