Added more Server functionality
Merge branch 'master' of https://github.com/NemoNessuno/SuperAwesomePictureChatOfDoom
deleted local swp files