1
Merge branch 'master' of https://github.com/ifconfigyeah/Docs

Conflicts:
	dist/alarm.py