test
Merge pull request #15 from OckhamsRazor/janelai

hahahahaha
a
send file
send file
fix conflict
send file 2
send file protocol
Merge pull request #16 from OckhamsRazor/bosh

bosh
logout
Merge pull request #17 from OckhamsRazor/YLC

logout
file
Merge pull request #18 from OckhamsRazor/bosh

file
send/recv file function done
Merge pull request #19 from OckhamsRazor/bosh

send/recv files
client logout reset
Merge pull request #20 from OckhamsRazor/bosh

client logout reset
ahhh