merging
Merge branch 'master' of https://github.com/nicholac/ballisticlos

Conflicts:
	blos/blos/algorithms/test_funcs.py