Config
fix merges
Implementation of the Qt user interface for the client
Fix Merge
Minor corrections
Merge pull request #8 from Mendroyxx/master

Setting the user interface (Qt) and fix merge.