Merge pull request #2 from jscoupreman/master

Importing jon's code
Merge pull request #3 from jscoupreman/master

Merging jsc
a
a
Merge branch 'master' of https://github.com/ArthurTesta/client

Conflicts:
	mainwindow.cpp
updating
Fixing connect bug
updating search + adding stream blackbox
Merge pull request #3 from ArthurTesta/master

pull