Brain shutting down, want to bached back up
Merge branch 'master' of github.com:Locu/kronos

Conflicts:
	kronos/client/client.py
Cleanup server code