Just want to pull it baby!
Merge branch 'master' of https://github.com/algovik/cloaked-octo-robot

Conflicts:
	Server/server.py

Signed-off-by: anickelbagoffunk <christoferpalmgren@gmail.com>