balbla
Merge branch 'master' of https://github.com/Mome/biofeedback

Conflicts:
	README.md