Merge branch 'master' of https://github.com/adriansoghoian/security-at-home

Conflicts:
	README.md
Merge branch 'master' of https://github.com/adriansoghoian/security-at-home

Conflicts:
	README.md
Merge branch 'master' of https://github.com/adriansoghoian/security-at-home