First prototype
Merge branch 'master' of https://github.com/rafamelo12/home_guard

Conflicts:
	server/websockServ.py
First prototype