login requst now says what it is
server stuff
Merge branch 'master' of github.com:Oswoll/Assassin
stuff
stuff
made a buggy version of the kill function
removed testing code
fixing conflicts