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

Conflicts:
	README.md
Pushing to master, might be late in the morning
Merge remote-tracking branch 'origin/omar'

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