fixing disconnect
Merge branch 'master' of https://github.com/NeilCBAndrews/CS317Assignment3
all should be working
Merge branch 'master' of https://github.com/NeilCBAndrews/CS317Assignment3
Merge branch 'master' of https://github.com/NeilCBAndrews/CS317Assignment3