sync
Merge branch 'master' of https://github.com/olafeee/UXX-Network-Monitor

Conflicts:
	src/server/server.py