wip
Merge branch 'master' of https://github.com/gavinmcdermott/phd4

Conflicts:
	client/phd4.html
wip
figuring out async logout issue
Merge branch 'master' of https://github.com/gavinmcdermott/phd4
fix shared server and client file issue