i..
Merge branch 'master' of https://github.com/krapskill/hpwifi

Conflicts:
	client/main.cpp
	client/main.o
starting implementing multithread in C++