Delete .__init__.py.swo
Merge branch 'develop'
Merge branch 'develop'
mean bfactor