added BSM to teleportation
Merge branch 'master' of https://github.com/wpfff/qtlab-user-diamond-master

Conflicts:
	scripts/teleportation/sequence.py