Better output formating
Merge branch 'master' of https://github.com/Phythm/Phythm.git

Conflicts:
	server.py