Merge pull request #3 from lizportnoy/master

Began server-side authentication. Not yet connected with server.
Pull upstream master to complete merge