initial proj version
1
Merge branch 'master' of https://github.com/willemveerman/BS_test

Conflicts:
	BS_test.py