lil' refactor and web sockets + encryption to serv
Merge branch 'master' of https://github.com/jackflips/Protest

Conflicts:
	README.md