contact & scientific info
Merge branch 'master' of github.com:bin5/bee

Conflicts:
	bee.py