del password
change

Merge branch 'master' of https://github.com/freifunkMUC/fastd-key-formular

Conflicts:
	password.sh.template