first on github
Merge branch 'master' of https://github.com/GiovanniCardamone/TickerServer

Conflicts:
	TickerServer.pro
	main.cpp
	main.qml